diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:01:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:01:22 +0200 |
| commit | 3c08a8365a7dede06620819a859f8ed93792d4e6 (patch) | |
| tree | 1a13826f2fd5092f900e95e9524e3e9342d4f519 | |
| parent | c3d188ffbbe0779a4bb62eef77b3eaa4670ea8d8 (diff) | |
| parent | 9cbca0266d7482a7d3d198acfa9f3a2661d435f3 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I903a1827c6680339a12a4ad9edf30f7d99c2a542
| -rw-r--r-- | dist/changes-5.7.0 | 24 | ||||
| -rw-r--r-- | src/plugins/imageformats/icns/qicnshandler.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/imageformats/macjp2/macjp2.pro | 2 |
3 files changed, 26 insertions, 2 deletions
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 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); } } 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 |