From 066c2bd90db50f67214bca5fee171f1d43391dc2 Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Mon, 30 Mar 2020 10:21:40 +0200 Subject: QAtomicInteger::loadRelaxed/storeRelaxed() are available since Qt 5.14 A similar patch was approved in https://phabricator.kde.org/D26102 --- src/core/kconfig.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/kconfig.cpp') diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp index b8fbba53..0d430792 100644 --- a/src/core/kconfig.cpp +++ b/src/core/kconfig.cpp @@ -57,7 +57,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, 15, 0) +#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 } @@ -75,7 +75,7 @@ KConfigPrivate::KConfigPrivate(KConfig::OpenFlags flags, QStringLiteral("/etc/kde5rc"); #endif if (!QFileInfo(etc_kderc).isReadable()) { -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) +#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) use_etc_kderc.store(false); #else use_etc_kderc.storeRelaxed(false); @@ -253,7 +253,7 @@ KConfig::KConfig(KConfigPrivate &d) KConfig::~KConfig() { Q_D(KConfig); -#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) +#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)) { -- cgit v1.2.1