diff options
| author | Laurent Montel <montel@kde.org> | 2019-10-31 06:59:16 +0100 |
|---|---|---|
| committer | Laurent Montel <montel@kde.org> | 2019-10-31 06:59:32 +0100 |
| commit | cf2c243ea9cc29e5267c076940c63d773da3d697 (patch) | |
| tree | 493a6ba8890761ef46477d6c2bc04f8b53b65999 /src | |
| parent | ee72e7e7916d9b166403c74fd3eb8e874176106e (diff) | |
| download | kconfig-cf2c243ea9cc29e5267c076940c63d773da3d697.tar.gz kconfig-cf2c243ea9cc29e5267c076940c63d773da3d697.tar.bz2 | |
These methods were adding in qt5.15
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/kconfig.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp index 70652365..140872b0 100644 --- a/src/core/kconfig.cpp +++ b/src/core/kconfig.cpp @@ -70,7 +70,7 @@ KConfigPrivate::KConfigPrivate(KConfig::OpenFlags flags, configState(KConfigBase::NoAccess) { static QBasicAtomicInt use_etc_kderc = Q_BASIC_ATOMIC_INITIALIZER(-1); -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) if (use_etc_kderc.load() < 0) { use_etc_kderc.store( !qEnvironmentVariableIsSet("KDE_SKIP_KDERC")); // for unit tests } @@ -88,7 +88,7 @@ KConfigPrivate::KConfigPrivate(KConfig::OpenFlags flags, QStringLiteral("/etc/kde5rc"); #endif if (!QFileInfo(etc_kderc).isReadable()) { -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) use_etc_kderc.store(false); #else use_etc_kderc.storeRelaxed(false); @@ -266,7 +266,7 @@ KConfig::KConfig(KConfigPrivate &d) KConfig::~KConfig() { Q_D(KConfig); -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) if (d->bDirty && (d->mBackend && d->mBackend->ref.load() == 1)) { #else if (d->bDirty && (d->mBackend && d->mBackend->ref.loadRelaxed() == 1)) { |