diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-17 22:55:27 +0200 |
| commit | d3d3db5a75fe2ba992742e418bfefa25eddf7684 (patch) | |
| tree | 7131b3fee95bdf30c92683c13bc9d121d670cc5b /src | |
| parent | 6d7af57f10ed2a02579e0e0f36b07926950ab3e5 (diff) | |
| parent | 78bc427395116bfaf3d99134f42aec5310020f8e (diff) | |
| download | qtsvg-d3d3db5a75fe2ba992742e418bfefa25eddf7684.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1
Change-Id: I7680d625bf0afec0bfd16a97c6656aab426f39a7
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp index 1342c0b..53e9a57 100644 --- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp +++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp @@ -69,7 +69,7 @@ public: QString pmcKey(const QSize &size, QIcon::Mode mode, QIcon::State state) { return QLatin1String("$qt_svgicon_") + QString::number(serialNum, 16).append(QLatin1Char('_')) - + QString::number((((((size.width()<<11)|size.height())<<11)|mode)<<4)|state, 16); } + + QString::number((((((qint64(size.width()) << 11) | size.height()) << 11) | mode) << 4) | state, 16); } void stepSerialNum() { serialNum = lastSerialNum.fetchAndAddRelaxed(1); } |