Fix namespace issue with the global static

(cherry picked from commit c99be6bf73dce10fc706764b72a8dacc1c6589a0)

diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index afbcff3..902902f 100644 (file)
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -274,11 +274,11 @@ Q_CORE_EXPORT bool qt_locale_initialized = false;
   Create an instance of Trolltech.conf. This ensures that the settings will not
   be thrown out of QSetting's cache for unused settings.
   */
-Q_GLOBAL_STATIC_WITH_ARGS(QSettings, trolltechConf, (QSettings::UserScope, QLatin1String("Trolltech")))
+Q_GLOBAL_STATIC_WITH_ARGS(QSettings, staticTrolltechConf, (QSettings::UserScope, QLatin1String("Trolltech")))
 
 QSettings *QCoreApplicationPrivate::trolltechConf()
 {
-    return ::trolltechConf();
+    return staticTrolltechConf();
 }
 
 Q_CORE_EXPORT uint qGlobalPostedEventsCount()