diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:39:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:39:15 +0100 |
| commit | e918605f4238841596a1723a0a8592ec152dc723 (patch) | |
| tree | 1c00298abfd5dbb47cb4125b22f37f14fcdbe4d8 /src/gui/image/qicon.cpp | |
| parent | 1a1a0e31590a5a7f360a86de5c34a2aec8e17157 (diff) | |
| parent | 15df60239d2dd3b0f0844e3ec8c91300fb7a4b67 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/corelib/json/qjsonparser.cpp
src/gui/opengl/qopengl.cpp
Change-Id: Ib4d3208398399691839e6c6eaeb9006f99e3a62b
Diffstat (limited to 'src/gui/image/qicon.cpp')
| -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 db118edf04..0d2f55b1c2 100644 --- a/src/gui/image/qicon.cpp +++ b/src/gui/image/qicon.cpp @@ -303,7 +303,7 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St QString key = QLatin1String("qt_") % HexString<quint64>(pm.cacheKey()) - % HexString<uint>(pe->mode) + % HexString<uint>(pe ? pe->mode : QIcon::Normal) % HexString<quint64>(QGuiApplication::palette().cacheKey()) % HexString<uint>(actualSize.width()) % HexString<uint>(actualSize.height()); |