From 500892be5d7526e226dbddb7d4570d47cf42eeff Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Sun, 5 Jan 2020 10:49:52 +0100
Subject: dec and hex as namespaced in qt5.15

---
 src/kconfig_compiler/kconfig_compiler.cpp | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'src/kconfig_compiler/kconfig_compiler.cpp')

diff --git a/src/kconfig_compiler/kconfig_compiler.cpp b/src/kconfig_compiler/kconfig_compiler.cpp
index c90c0af0..985210f5 100644
--- a/src/kconfig_compiler/kconfig_compiler.cpp
+++ b/src/kconfig_compiler/kconfig_compiler.cpp
@@ -2082,13 +2082,25 @@ int main(int argc, char **argv)
                 exit(1);
             }
             Signal signal = *it;
-            h << "      " << signalEnumName(signal.name) << " = 0x" << hex << val;
+            h << "      " << signalEnumName(signal.name) << " = 0x" <<
+     #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
+                 hex
+     #else
+                 Qt::hex
+     #endif
+              << val;
             if (++it != itEnd) {
                 h << ",";
             }
             h << endl;
         }
-        h << "    };" << dec << endl << endl;
+        h << "    };" <<
+     #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
+             dec
+     #else
+             Qt::dec
+     #endif
+          << endl << endl;
 
         h << "  Q_SIGNALS:";
         for (const Signal &signal : qAsConst(signalList)) {
-- 
cgit v1.2.1