From efaf86217ca028068bd54ec9eb54d01c52fad117 Mon Sep 17 00:00:00 2001
From: David Gil <davidgiloliva@gmail.com>
Date: Tue, 29 Jul 2014 23:23:15 +0200
Subject: Fix KConfig compilation

KConfig fails building because QBasicAtomicInt is being treated as an int.

REVIEW: 119417
---
 src/core/kconfig.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp
index 14a5d39c..c6dec436 100644
--- a/src/core/kconfig.cpp
+++ b/src/core/kconfig.cpp
@@ -64,10 +64,10 @@ KConfigPrivate::KConfigPrivate(KConfig::OpenFlags flags,
     sGlobalFileName = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1String("/kdeglobals");
 
     static QBasicAtomicInt use_etc_kderc = Q_BASIC_ATOMIC_INITIALIZER(-1);
-    if (use_etc_kderc < 0) {
-        use_etc_kderc = !qEnvironmentVariableIsSet("KDE_SKIP_KDERC");    // for unit tests
+    if (use_etc_kderc.load() < 0) {
+        use_etc_kderc.store( !qEnvironmentVariableIsSet("KDE_SKIP_KDERC"));    // for unit tests
     }
-    if (use_etc_kderc) {
+    if (use_etc_kderc.load()) {
 
         etc_kderc =
 #ifdef Q_OS_WIN
-- 
cgit v1.2.1