diff options
| author | David Faure <faure@kde.org> | 2014-06-28 00:10:51 +0200 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2014-06-28 00:10:51 +0200 |
| commit | c77261ee218f2364fff3d2dc97d6cbaa862ba69d (patch) | |
| tree | 2016c5894866db0b8ffbee3f0a0920af0c86d42d /src/core/kconfig.cpp | |
| parent | bcac505588d8e14817aeede8b2f21be6cbe4da34 (diff) | |
| download | kconfig-c77261ee218f2364fff3d2dc97d6cbaa862ba69d.tar.gz kconfig-c77261ee218f2364fff3d2dc97d6cbaa862ba69d.tar.bz2 | |
Fix data race on static int.
Diffstat (limited to 'src/core/kconfig.cpp')
| -rw-r--r-- | src/core/kconfig.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp index 484a9a97..14a5d39c 100644 --- a/src/core/kconfig.cpp +++ b/src/core/kconfig.cpp @@ -63,7 +63,7 @@ KConfigPrivate::KConfigPrivate(KConfig::OpenFlags flags, { sGlobalFileName = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1String("/kdeglobals"); - static int use_etc_kderc = -1; + 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 } |