summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qicon.cpp
diff options
context:
space:
mode:
authorJens Bache-Wiig <jbache@trolltech.com>2009-04-15 14:39:58 (GMT)
committerJens Bache-Wiig <jbache@trolltech.com>2009-04-15 14:42:05 (GMT)
commit8ec0109a5d5ce5e81a45ca8b294369a8a991f7f2 (patch)
tree0f15caa0259056aa1d55199c96513a6e081194d5 /src/gui/image/qicon.cpp
parent1ebd0d5e4ad2dd27909b58a57ef15b1cc62d5d02 (diff)
downloadQt-8ec0109a5d5ce5e81a45ca8b294369a8a991f7f2.zip
Qt-8ec0109a5d5ce5e81a45ca8b294369a8a991f7f2.tar.gz
Qt-8ec0109a5d5ce5e81a45ca8b294369a8a991f7f2.tar.bz2
Make QIcon update after palette changes
We have to add the palette cacheKey to ensure that the icon is properly regenerated after a system palette change. Task-number: 250542 Reviewed-by: nrc
Diffstat (limited to 'src/gui/image/qicon.cpp')
-rw-r--r--src/gui/image/qicon.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/image/qicon.cpp b/src/gui/image/qicon.cpp
index 3c71f15..0514567 100644
--- a/src/gui/image/qicon.cpp
+++ b/src/gui/image/qicon.cpp
@@ -304,6 +304,8 @@ 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())
+ + QLatin1Char('_')
+ QString::number(actualSize.width())
+ QLatin1Char('_')
+ QString::number(actualSize.height())