diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-09 16:58:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-09 16:58:37 (GMT) |
| commit | ecf66e5825d186f57468c6bf682dce32c0cd96d7 (patch) | |
| tree | e945d43208b1e166b27772662f5542384b99c567 /tools/designer/src/lib/shared/iconloader.cpp | |
| parent | e1b4ac7eec876d80dc2984f192baa6295b027793 (diff) | |
| parent | f38f61df31b708e1f4e50c5fdcc30099f9a1fe8f (diff) | |
| download | Qt-ecf66e5825d186f57468c6bf682dce32c0cd96d7.zip Qt-ecf66e5825d186f57468c6bf682dce32c0cd96d7.tar.gz Qt-ecf66e5825d186f57468c6bf682dce32c0cd96d7.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Fix warnings ~QX11PixmapData(): QPixmap objects must be destroyed..
fix a few mistakes in German translation
Fix Float Conversion in xmlpatterns
generate code which does not break QT_USE_FAST_CONCATENATION with old gcc
drastically improve load time of TS files
Diffstat (limited to 'tools/designer/src/lib/shared/iconloader.cpp')
| -rw-r--r-- | tools/designer/src/lib/shared/iconloader.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/designer/src/lib/shared/iconloader.cpp b/tools/designer/src/lib/shared/iconloader.cpp index df0bb7e..ed312b8 100644 --- a/tools/designer/src/lib/shared/iconloader.cpp +++ b/tools/designer/src/lib/shared/iconloader.cpp @@ -70,8 +70,7 @@ QDESIGNER_SHARED_EXPORT QIcon createIconSet(const QString &name) QDESIGNER_SHARED_EXPORT QIcon emptyIcon() { - static const QIcon empty_icon(QLatin1String(":/trolltech/formeditor/images/emptyicon.png")); - return empty_icon; + return QIcon(QLatin1String(":/trolltech/formeditor/images/emptyicon.png")); } } // namespace qdesigner_internal |