diff options
| author | Albert Astals Cid <aacid@kde.org> | 2020-12-18 19:16:53 +0100 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2020-12-18 19:16:53 +0100 |
| commit | d9eb723d528c63265a6a534a3a6b660eded95d45 (patch) | |
| tree | d3dada4c04100594e7bc05d4cfb3a0bbce961915 /src/core/kconfig.cpp | |
| parent | 6399823048ffe243767d7ccf75a9a802b1ab7513 (diff) | |
| download | kconfig-d9eb723d528c63265a6a534a3a6b660eded95d45.tar.gz kconfig-d9eb723d528c63265a6a534a3a6b660eded95d45.tar.bz2 | |
Remove ifdefs, we require Qt 5.14 now
Diffstat (limited to 'src/core/kconfig.cpp')
| -rw-r--r-- | src/core/kconfig.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp index 4584a65e..2a3c614f 100644 --- a/src/core/kconfig.cpp +++ b/src/core/kconfig.cpp @@ -67,17 +67,10 @@ KConfigPrivate::KConfigPrivate(KConfig::OpenFlags flags, } static QBasicAtomicInt use_etc_kderc = Q_BASIC_ATOMIC_INITIALIZER(-1); -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - if (use_etc_kderc.load() < 0) { - use_etc_kderc.store( !qEnvironmentVariableIsSet("KDE_SKIP_KDERC")); // for unit tests - } - if (use_etc_kderc.load()) { -#else if (use_etc_kderc.loadRelaxed() < 0) { use_etc_kderc.storeRelaxed( !qEnvironmentVariableIsSet("KDE_SKIP_KDERC")); // for unit tests } if (use_etc_kderc.loadRelaxed()) { -#endif etc_kderc = #ifdef Q_OS_WIN QFile::decodeName(qgetenv("WINDIR") + "/kde5rc"); @@ -85,11 +78,7 @@ KConfigPrivate::KConfigPrivate(KConfig::OpenFlags flags, QStringLiteral("/etc/kde5rc"); #endif if (!QFileInfo(etc_kderc).isReadable()) { -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - use_etc_kderc.store(false); -#else use_etc_kderc.storeRelaxed(false); -#endif etc_kderc.clear(); } } @@ -267,11 +256,7 @@ KConfig::KConfig(KConfigPrivate &d) KConfig::~KConfig() { Q_D(KConfig); -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) - if (d->bDirty && (d->mBackend && d->mBackend->ref.load() == 1)) { -#else if (d->bDirty && (d->mBackend && d->mBackend->ref.loadRelaxed() == 1)) { -#endif sync(); } delete d; |