From 42b07b2ddf443d3eafd18e169f2e5ab5e36604a5 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Fri, 8 Apr 2016 22:08:43 -0700 Subject: Remove un-needed dependency on IOKit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This framework is considered private on iOS, so we *can't* use it there. This amends 50e257de2642fc980d4e82fb99d455ca784f11bd. Change-Id: I6aad57540dbbf95b86bd43f265e810e67a2fb2f5 Reviewed-by: Tor Arne Vestbø Reviewed-by: aavit --- src/plugins/imageformats/macjp2/macjp2.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/imageformats/macjp2/macjp2.pro b/src/plugins/imageformats/macjp2/macjp2.pro index 47c7e12..5e026b6 100644 --- a/src/plugins/imageformats/macjp2/macjp2.pro +++ b/src/plugins/imageformats/macjp2/macjp2.pro @@ -2,7 +2,7 @@ TARGET = qmacjp2 PLUGIN_TYPE = imageformats PLUGIN_CLASS_NAME = QMacJp2Plugin -LIBS += -framework IOKit -framework ImageIO +LIBS += -framework ImageIO QT += core-private gui-private platformsupport-private -- cgit v1.2.3 From 68d9cfe5256c91510552c2b16d5efdb01e77ea57 Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Tue, 26 Apr 2016 15:22:15 +0200 Subject: Add changes file for 5.7 Change-Id: I21e29561c995e854a58a9197a90f672efc49aeac Reviewed-by: Liang Qi --- dist/changes-5.7.0 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 dist/changes-5.7.0 diff --git a/dist/changes-5.7.0 b/dist/changes-5.7.0 new file mode 100644 index 0000000..97e334c --- /dev/null +++ b/dist/changes-5.7.0 @@ -0,0 +1,24 @@ +Qt 5.7 introduces many new features and improvements as well as bugfixes +over the 5.6.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + + http://doc.qt.io + +The Qt version 5.7 series is binary compatible with the 5.6.x series. +Applications compiled for 5.6 will continue to run with 5.7. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt.io + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* General * +**************************************************************************** + +- A new JPEG 2000 plugin for OS X added, utilizing native codec framework +- Bundled libwebp updated to version 0.5.0. +- Issue fixed where TIFF alpha channel could be misread -- cgit v1.2.3 From cbf2d7e7696a4a08360c2004dfcbb8be7c1d2edb Mon Sep 17 00:00:00 2001 From: Frank Meerkoetter Date: Mon, 9 May 2016 19:43:39 +0200 Subject: Fix build issue with QT_USE_QTSTRINGBUILDER Change-Id: Ib10e37f32e3b83c767a6b0ef2d0ae527e2435f49 Reviewed-by: Thiago Macieira Reviewed-by: Marc Mutz --- 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 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