1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use Q_GLOBAL_STATIC for trivial type QLocaleData

Browse Source 
Change-Id: I9435295a753d7dabea202fde876786d876a295fa
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Sérgio Martins 2016-01-23 13:18:39 +00:00 committed by Sérgio Martins
parent 24642df23c
commit 5b75a16e8f
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/tools/qlocale.cpp
View File

@ -80,7 +80,7 @@ public:
Q_GLOBAL_STATIC(QSystemLocaleSingleton, QSystemLocale_globalSystemLocale) Q_GLOBAL_STATIC(QSystemLocaleSingleton, QSystemLocale_globalSystemLocale)
static QLocaleData *system_data = 0; static QLocaleData *system_data = 0;
Q_GLOBAL_STATIC(QLocaleData, globalLocaleData) static QLocaleData globalLocaleData;
#endif #endif
/****************************************************************************** /******************************************************************************
@ -595,7 +595,7 @@ void QLocalePrivate::updateSystemPrivate()
{ {
const QSystemLocale *sys_locale = systemLocale(); const QSystemLocale *sys_locale = systemLocale();
if (!system_data) if (!system_data)
system_data = globalLocaleData(); system_data = &globalLocaleData;
// tell the object that the system locale has changed. // tell the object that the system locale has changed.
sys_locale->query(QSystemLocale::LocaleChanged, QVariant()); sys_locale->query(QSystemLocale::LocaleChanged, QVariant());