diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2022-04-21 15:03:48 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2022-04-22 15:27:43 +0200 |
| commit | 396190686c4d1162953badf90f9aab9992bd1e76 (patch) | |
| tree | 9f731524b706fdee3fc15036d91844756f518a23 /src/corelib/text | |
| parent | 48561178e2488e6fe7763c2229d66072810afcb3 (diff) | |
Exploit the new macro varargs form of Q_GLOBAL_STATIC
Convert various uses of Q_GLOBAL_STATIC_WITH_ARGS() to the less
verbose form the recent reworking makes possible.
Change-Id: I57820660b5d00d39bf54b5a08cb921ebaec57c7c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/text')
| -rw-r--r-- | src/corelib/text/qlocale.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index 1f2a0b62e2..bdd896b4c8 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -860,8 +860,8 @@ QDataStream &operator>>(QDataStream &ds, QLocale &l) static const int locale_data_size = sizeof(locale_data)/sizeof(QLocaleData) - 1; Q_CONSTINIT QBasicAtomicInt QLocalePrivate::s_generation = Q_BASIC_ATOMIC_INITIALIZER(0); -Q_GLOBAL_STATIC_WITH_ARGS(QSharedDataPointer<QLocalePrivate>, defaultLocalePrivate, - (new QLocalePrivate(defaultData(), defaultIndex()))) +Q_GLOBAL_STATIC(QSharedDataPointer<QLocalePrivate>, defaultLocalePrivate, + new QLocalePrivate(defaultData(), defaultIndex())) static QLocalePrivate *localePrivateByName(QStringView name) { |