diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-12 07:47:49 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-12 07:47:49 (GMT) |
| commit | 6ab9ca55342dad0ce16402b7d2f8d47d61a0af76 (patch) | |
| tree | 8a022fb07d41cb3d7f3850ae5f68a15ecd8130c5 /src/gui/image | |
| parent | 144154046529e557616738c13b3721e3cab77301 (diff) | |
| parent | d0baa9b8dc9ed191903447032f1cf6afe9a2463e (diff) | |
| download | Qt-6ab9ca55342dad0ce16402b7d2f8d47d61a0af76.zip Qt-6ab9ca55342dad0ce16402b7d2f8d47d61a0af76.tar.gz Qt-6ab9ca55342dad0ce16402b7d2f8d47d61a0af76.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/gui/graphicsview/qgraphicsitem_p.h
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qicon.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp index f24aeff..7e262b1 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -304,7 +304,7 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St QString key = QLatin1String("$qt_icon_") + QString::number(pm.cacheKey()) + QString::number(pe->mode) - + QString::number(qApp->palette().cacheKey()) + + QString::number(QApplication::palette().cacheKey()) + QLatin1Char('_') + QString::number(actualSize.width()) + QLatin1Char('_') |