diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:30:21 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:30:21 +0200 |
commit | 9cbca0266d7482a7d3d198acfa9f3a2661d435f3 (patch) | |
tree | 34900f9e0ec7ba86ad3d1f9c69304d63df881fb6 | |
parent | 68d9cfe5256c91510552c2b16d5efdb01e77ea57 (diff) | |
parent | 6415dae76eb8586f6e520961a76996df2425476d (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1
Conflicts:
.qmake.conf
Change-Id: Ia13df3c003ab6352c368fe4f3ac8342d0d686d0a
-rw-r--r-- | src/plugins/imageformats/icns/qicnshandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/imageformats/icns/qicnshandler.cpp b/src/plugins/imageformats/icns/qicnshandler.cpp index 7a19f6e..a854506 100644 --- a/src/plugins/imageformats/icns/qicnshandler.cpp +++ b/src/plugins/imageformats/icns/qicnshandler.cpp @@ -816,7 +816,7 @@ QVariant QICNSHandler::option(ImageOption option) const if (imageCount() > 0 && m_currentIconIndex <= imageCount()) { const ICNSEntry &icon = m_icons.at(m_currentIconIndex); if (icon.variant != 0) - return nameFromOSType(icon.variant) + '-' + nameFromOSType(icon.ostype); + return QByteArray(nameFromOSType(icon.variant) + '-' + nameFromOSType(icon.ostype)); return nameFromOSType(icon.ostype); } } |