Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1

Conflicts:
	.qmake.conf

Change-Id: Ia13df3c003ab6352c368fe4f3ac8342d0d686d0a

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);
         }
     }