diff options
| author | Sérgio Martins <sergio.martins@kdab.com> | 2016-01-23 13:18:39 +0000 |
|---|---|---|
| committer | Sérgio Martins <iamsergio@gmail.com> | 2016-02-03 15:53:11 +0000 |
| commit | 5b75a16e8f0f410ad1165dc8cff73c199ea5ac1c (patch) | |
| tree | 3e1914eb4c893e3ae3642d13ac0e7f9ae5150690 /src/corelib | |
| parent | 24642df23ca33436bb9deb02ee5a85287b019af9 (diff) | |
Don't use Q_GLOBAL_STATIC for trivial type QLocaleData
Change-Id: I9435295a753d7dabea202fde876786d876a295fa
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 323a40cf1b..ca70d89a83 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -80,7 +80,7 @@ public: Q_GLOBAL_STATIC(QSystemLocaleSingleton, QSystemLocale_globalSystemLocale) static QLocaleData *system_data = 0; -Q_GLOBAL_STATIC(QLocaleData, globalLocaleData) +static QLocaleData globalLocaleData; #endif /****************************************************************************** @@ -595,7 +595,7 @@ void QLocalePrivate::updateSystemPrivate() { const QSystemLocale *sys_locale = systemLocale(); if (!system_data) - system_data = globalLocaleData(); + system_data = &globalLocaleData; // tell the object that the system locale has changed. sys_locale->query(QSystemLocale::LocaleChanged, QVariant()); |