From a9a850952bc7f7766f6116d984386928bed1893d Mon Sep 17 00:00:00 2001 From: mae Date: Mon, 2 May 2011 12:45:43 +0200 Subject: Fix namespace issue with the global static (cherry picked from commit c99be6bf73dce10fc706764b72a8dacc1c6589a0) --- src/corelib/kernel/qcoreapplication.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index afbcff3eb9..902902f087 100644 --- 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() -- cgit v1.2.3