diff options
| author | mae <qt-info@nokia.com> | 2011-05-02 10:45:43 (GMT) |
|---|---|---|
| committer | mae <qt-info@nokia.com> | 2011-05-02 10:45:43 (GMT) |
| commit | c99be6bf73dce10fc706764b72a8dacc1c6589a0 (patch) | |
| tree | 876937f750d68f4d7178ef445ebab01134f009a2 | |
| parent | 988871dabf3c949ffc71d126131281a3ae641ebf (diff) | |
| download | Qt-c99be6bf73dce10fc706764b72a8dacc1c6589a0.zip Qt-c99be6bf73dce10fc706764b72a8dacc1c6589a0.tar.gz Qt-c99be6bf73dce10fc706764b72a8dacc1c6589a0.tar.bz2 | |
Fix namespace issue with the global static
| -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 e569894..c0b1748 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() |