From 5b75a16e8f0f410ad1165dc8cff73c199ea5ac1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Martins?= Date: Sat, 23 Jan 2016 13:18:39 +0000 Subject: Don't use Q_GLOBAL_STATIC for trivial type QLocaleData Change-Id: I9435295a753d7dabea202fde876786d876a295fa Reviewed-by: Marc Mutz --- src/corelib/tools/qlocale.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/tools/qlocale.cpp') 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()); -- cgit v1.2.3