summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Meerkoetter <frank.meerkoetter@basyskom.com>2016-05-09 19:43:39 +0200
committerFrank Meerkoetter <frank.meerkoetter@basyskom.com>2016-05-10 18:22:55 +0000
commitcbf2d7e7696a4a08360c2004dfcbb8be7c1d2edb (patch)
tree1ec79089489a39d53f5bf623b63b9e80480cb85a
parentbf5b49878d75d316f31225f76152e8381a3d5f0f (diff)
Fix build issue with QT_USE_QTSTRINGBUILDERv5.6.1-1v5.6.1
Change-Id: Ib10e37f32e3b83c767a6b0ef2d0ae527e2435f49 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
-rw-r--r--src/plugins/imageformats/icns/qicnshandler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/imageformats/icns/qicnshandler.cpp b/src/plugins/imageformats/icns/qicnshandler.cpp
index e271ff3..7c66752 100644
--- a/src/plugins/imageformats/icns/qicnshandler.cpp
+++ b/src/plugins/imageformats/icns/qicnshandler.cpp
@@ -810,7 +810,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);
}
}