diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-08 12:16:18 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-11-08 12:16:18 +0000 |
| commit | ef5b4d2ada000dcbd239b1cedfb38104e3f40d29 (patch) | |
| tree | 2ae0db1d81072b6693b4758ee7f446db2238f4d5 /src/gui/image/qicon.cpp | |
| parent | baebb6aa26799e627bc3be6bf41589cef422bed2 (diff) | |
| parent | 9d50df5511e7919d9e03e5f70c693d36af8204f2 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
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()); |