diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2011-09-15 22:28:07 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-23 13:04:13 +0200 |
commit | ceb3a071d2e5bf4f3c6ea30dec983c3852959ed9 (patch) | |
tree | 8ae22ee7e18533b1df9734a25e68c85242f3f2bd /src/widgets/kernel/qicon.cpp | |
parent | 0bc19b49975bc82185aa24857f2a921584c9684f (diff) |
Remove Q_GLOBAL_STATIC_WITH_INITIALIZER from QtWidgets
Change-Id: Iecad85fbbfabe41c3a332be2ee0ce3a643db7731
Reviewed-on: http://codereview.qt-project.org/5025
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'src/widgets/kernel/qicon.cpp')
-rw-r--r-- | src/widgets/kernel/qicon.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/widgets/kernel/qicon.cpp b/src/widgets/kernel/qicon.cpp index bb9f56b715..73f8a2a360 100644 --- a/src/widgets/kernel/qicon.cpp +++ b/src/widgets/kernel/qicon.cpp @@ -107,8 +107,18 @@ QT_BEGIN_NAMESPACE static QBasicAtomicInt serialNumCounter = Q_BASIC_ATOMIC_INITIALIZER(1); static void qt_cleanup_icon_cache(); -typedef QCache<QString, QIcon> IconCache; -Q_GLOBAL_STATIC_WITH_INITIALIZER(IconCache, qtIconCache, qAddPostRoutine(qt_cleanup_icon_cache)) +namespace { + struct IconCache : public QCache<QString, QIcon> + { + IconCache() + { + // ### note: won't readd if QApplication is re-created! + qAddPostRoutine(qt_cleanup_icon_cache); + } + }; +} + +Q_GLOBAL_STATIC(IconCache, qtIconCache) static void qt_cleanup_icon_cache() { |