diff options
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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() |