diff -r 5dc02b23752f -r 3e2da88830cd src/gui/image/qiconloader.cpp --- a/src/gui/image/qiconloader.cpp Tue Jul 06 15:10:48 2010 +0300 +++ b/src/gui/image/qiconloader.cpp Wed Aug 18 10:37:55 2010 +0300 @@ -63,6 +63,8 @@ #include #endif +#include + QT_BEGIN_NAMESPACE Q_GLOBAL_STATIC(QIconLoader, iconLoaderInstance) @@ -488,14 +490,12 @@ basePixmap.load(filename); int actualSize = qMin(size.width(), size.height()); - QString key = QLatin1String("$qt_theme_") - + QString::number(basePixmap.cacheKey(), 16) - + QLatin1Char('_') - + QString::number(mode) - + QLatin1Char('_') - + QString::number(qApp->palette().cacheKey(), 16) - + QLatin1Char('_') - + QString::number(actualSize); + + QString key = QLatin1Literal("$qt_theme_") + % HexString(basePixmap.cacheKey()) + % HexString(mode) + % HexString(qApp->palette().cacheKey()) + % HexString(actualSize); QPixmap cachedPixmap; if (QPixmapCache::find(key, &cachedPixmap)) {