From cbf2d7e7696a4a08360c2004dfcbb8be7c1d2edb Mon Sep 17 00:00:00 2001
From: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Date: Mon, 9 May 2016 19:43:39 +0200
Subject: Fix build issue with QT_USE_QTSTRINGBUILDER

Change-Id: Ib10e37f32e3b83c767a6b0ef2d0ae527e2435f49
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
---
 src/plugins/imageformats/icns/qicnshandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
         }
     }
-- 
cgit v1.2.3


From 6415dae76eb8586f6e520961a76996df2425476d Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Thu, 19 May 2016 13:26:52 +0200
Subject: Bump version

Change-Id: I788985581d9806b8a07470e2181592f40b5dca50
---
 .qmake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.qmake.conf b/.qmake.conf
index b642527..21c63db 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
 load(qt_build_config)
 
-MODULE_VERSION = 5.6.1
+MODULE_VERSION = 5.6.2
-- 
cgit v1.2.3