diff options
| author | David Gil <davidgiloliva@gmail.com> | 2014-07-29 23:23:15 +0200 |
|---|---|---|
| committer | David Gil <davidgiloliva@gmail.com> | 2014-07-29 23:25:42 +0200 |
| commit | efaf86217ca028068bd54ec9eb54d01c52fad117 (patch) | |
| tree | ec414a1a35138c7d972b1368ab9119050c68e7bc /src/core | |
| parent | 29354344ef888b1b6c48b5c0b5d1758e5525022b (diff) | |
| download | kconfig-efaf86217ca028068bd54ec9eb54d01c52fad117.tar.gz kconfig-efaf86217ca028068bd54ec9eb54d01c52fad117.tar.bz2 | |
Fix KConfig compilation
KConfig fails building because QBasicAtomicInt is being treated as an int.
REVIEW: 119417
Diffstat (limited to 'src/core')
| -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 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 |