diff options
| author | Laurent Montel <montel@kde.org> | 2020-01-05 10:49:52 +0100 |
|---|---|---|
| committer | Laurent Montel <montel@kde.org> | 2020-01-05 10:49:52 +0100 |
| commit | 500892be5d7526e226dbddb7d4570d47cf42eeff (patch) | |
| tree | 478cb358ac701e3e99cce41b142c9b3e9dc5178a /src | |
| parent | 65ed3814699aabbd0d6b4725e54487d9db82bf59 (diff) | |
| download | kconfig-500892be5d7526e226dbddb7d4570d47cf42eeff.tar.gz kconfig-500892be5d7526e226dbddb7d4570d47cf42eeff.tar.bz2 | |
dec and hex as namespaced in qt5.15
Diffstat (limited to 'src')
| -rw-r--r-- | src/kconfig_compiler/kconfig_compiler.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
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)) { |