diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2011-08-31 10:32:41 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-22 20:59:27 +0100 |
| commit | 8df589bebca135bd9ba0c7c65c9aba052e2dd637 (patch) | |
| tree | 087961028f4f1dc3b12dbcd9c230650cc9c91cda /src/corelib/tools/qlocale_p.h | |
| parent | 6cdbfc6f9443d9818792b1a396cf3c13dad5e2f3 (diff) | |
Make QLocale not depend on being friends with the global static
Don't assume that the global static is a function. Instead, create a
class that is friends.
Change-Id: I992f4d819b367899b19d95b4983e6b243f0ed932
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/tools/qlocale_p.h')
| -rw-r--r-- | src/corelib/tools/qlocale_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h index ad7c9706c4..377a60881f 100644 --- a/src/corelib/tools/qlocale_p.h +++ b/src/corelib/tools/qlocale_p.h @@ -122,7 +122,7 @@ public: private: QSystemLocale(bool); - friend QSystemLocale *QSystemLocale_globalSystemLocale(); + friend class QSystemLocaleSingleton; }; #endif |