whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix namespace issue with the global static 

(cherry picked from commit c99be6bf73dce10fc706764b72a8dacc1c6589a0)
bb10
mae 2011-05-02 12:45:43 +02:00 committed by Olivier Goffart
parent c500291e42
commit a9a850952b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/kernel/qcoreapplication.cpp
View File

@ -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()