Merge remote-tracking branch 'origin/5.13' into dev

 Conflicts:
	.qmake.conf

Change-Id: I6df1d00c168de838ef2a42ae528536c684bd631d

17 files changed, 93 insertions, 5 deletions

diff --git a/dist/changes-5.12.4 b/dist/changes-5.12.4
new file mode 100644
index 0000000..8bf609e
--- /dev/null
+++ b/dist/changes-5.12.4
@@ -0,0 +1,28 @@
+Qt 5.12.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.3.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                                 General                                  *
+****************************************************************************
+
+ - The qtimageformats module now offers configuration settings
+   available in the global Qt configure. The image format handlers
+   based on external codecs can be enabled or disabled, and the choice
+   between bundled and system codec library can be set.
+
diff --git a/dist/changes-5.13.0 b/dist/changes-5.13.0
new file mode 100644
index 0000000..e45986b
--- /dev/null
+++ b/dist/changes-5.13.0
@@ -0,0 +1,31 @@
+Qt 5.13 introduces many new features and improvements as well as bugfixes
+over the 5.12.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                                 General                                  *
+****************************************************************************
+
+ - The qtimageformats module now offers configuration settings
+   available in the global Qt configure. The image format handlers
+   based on external codecs can be enabled or disabled, and the choice
+   between bundled and system codec library can be set.
+
+****************************************************************************
+*                                   TIFF                                   *
+****************************************************************************
+
+ - Support for reading and writing images in Grayscale16 format added.
diff --git a/src/imageformats/doc/qtimageformats.qdocconf b/src/imageformats/doc/qtimageformats.qdocconf
index a45751d..f12fe14 100644
--- a/src/imageformats/doc/qtimageformats.qdocconf
+++ b/src/imageformats/doc/qtimageformats.qdocconf
@@ -1,4 +1,5 @@
 include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+include($QT_INSTALL_DOCS/config/exampleurl-qtimageformats.qdocconf)
 
 # Name of the project.
 project     = QtImageFormats
diff --git a/src/plugins/imageformats/dds/qddshandler.cpp b/src/plugins/imageformats/dds/qddshandler.cpp
index 3a44b51..845f9b3 100644
--- a/src/plugins/imageformats/dds/qddshandler.cpp
+++ b/src/plugins/imageformats/dds/qddshandler.cpp
@@ -1382,10 +1382,12 @@ QDDSHandler::QDDSHandler() :
 {
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 QByteArray QDDSHandler::name() const
 {
     return QByteArrayLiteral("dds");
 }
+#endif
 
 bool QDDSHandler::canRead() const
 {
diff --git a/src/plugins/imageformats/dds/qddshandler.h b/src/plugins/imageformats/dds/qddshandler.h
index 665bd16..f4bc888 100644
--- a/src/plugins/imageformats/dds/qddshandler.h
+++ b/src/plugins/imageformats/dds/qddshandler.h
@@ -53,7 +53,9 @@ class QDDSHandler : public QImageIOHandler
 public:
     QDDSHandler();
 
+#if QT_DEPRECATED_SINCE(5, 13)
     QByteArray name() const override;
+#endif
 
     bool canRead() const override;
     bool read(QImage *image) override;
diff --git a/src/plugins/imageformats/icns/qicnshandler.cpp b/src/plugins/imageformats/icns/qicnshandler.cpp
index a854506..9733ed7 100644
--- a/src/plugins/imageformats/icns/qicnshandler.cpp
+++ b/src/plugins/imageformats/icns/qicnshandler.cpp
@@ -651,10 +651,12 @@ QICNSHandler::QICNSHandler() :
 {
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 QByteArray QICNSHandler::name() const
 {
     return QByteArrayLiteral("icns");
 }
+#endif
 
 bool QICNSHandler::canRead(QIODevice *device)
 {
diff --git a/src/plugins/imageformats/icns/qicnshandler_p.h b/src/plugins/imageformats/icns/qicnshandler_p.h
index 84c7bf1..b532045 100644
--- a/src/plugins/imageformats/icns/qicnshandler_p.h
+++ b/src/plugins/imageformats/icns/qicnshandler_p.h
@@ -132,7 +132,9 @@ public:
     bool read(QImage *image) override;
     bool write(const QImage &image) override;
 
+#if QT_DEPRECATED_SINCE(5, 13)
     QByteArray name() const override;
+#endif
 
     bool supportsOption(ImageOption option) const override;
     QVariant option(ImageOption option) const override;
diff --git a/src/plugins/imageformats/jp2/qjp2handler.cpp b/src/plugins/imageformats/jp2/qjp2handler.cpp
index 17373fd..ce23480 100644
--- a/src/plugins/imageformats/jp2/qjp2handler.cpp
+++ b/src/plugins/imageformats/jp2/qjp2handler.cpp
@@ -308,6 +308,7 @@ bool QJp2Handler::supportsOption(ImageOption option) const
     return (option == Quality || option == SubType);
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     Return the common identifier of the format.
     For JPEG 2000 this will return "jp2".
@@ -316,6 +317,7 @@ QByteArray QJp2Handler::name() const
 {
     return QByteArrayLiteral("jp2");
 }
+#endif
 
 /*!
     Automatic resource handling for a jas_image_t*.
diff --git a/src/plugins/imageformats/jp2/qjp2handler_p.h b/src/plugins/imageformats/jp2/qjp2handler_p.h
index e81ec9e..16ddc8a 100644
--- a/src/plugins/imageformats/jp2/qjp2handler_p.h
+++ b/src/plugins/imageformats/jp2/qjp2handler_p.h
@@ -64,7 +64,9 @@ public:
     QVariant option(ImageOption option) const override;
     void setOption(ImageOption option, const QVariant &value) override;
     bool supportsOption(ImageOption option) const override;
+#if QT_DEPRECATED_SINCE(5, 13)
     QByteArray name() const override;
+#endif
 
 private:
     Q_DECLARE_PRIVATE(QJp2Handler)
diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro
index 4641110..f509fa8 100644
--- a/src/plugins/imageformats/mng/mng.pro
+++ b/src/plugins/imageformats/mng/mng.pro
@@ -5,8 +5,10 @@ SOURCES += main.cpp \
            qmnghandler.cpp
 OTHER_FILES += mng.json
 
-msvc: LIBS += libmng.lib
-else: LIBS += -lmng
+include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri)
+QT_FOR_CONFIG += imageformats-private
+
+QMAKE_USE_PRIVATE += mng
 
 PLUGIN_TYPE = imageformats
 PLUGIN_CLASS_NAME = QMngPlugin
diff --git a/src/plugins/imageformats/tga/qtgahandler.cpp b/src/plugins/imageformats/tga/qtgahandler.cpp
index 8f5eb12..9277e50 100644
--- a/src/plugins/imageformats/tga/qtgahandler.cpp
+++ b/src/plugins/imageformats/tga/qtgahandler.cpp
@@ -98,10 +98,12 @@ bool QTgaHandler::read(QImage *image)
     return !image->isNull();
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 QByteArray QTgaHandler::name() const
 {
     return "tga";
 }
+#endif
 
 QVariant QTgaHandler::option(ImageOption option) const
 {
diff --git a/src/plugins/imageformats/tga/qtgahandler.h b/src/plugins/imageformats/tga/qtgahandler.h
index 5ef7e02..6550a11 100644
--- a/src/plugins/imageformats/tga/qtgahandler.h
+++ b/src/plugins/imageformats/tga/qtgahandler.h
@@ -55,7 +55,9 @@ public:
     bool canRead() const override;
     bool read(QImage *image) override;
 
+#if QT_DEPRECATED_SINCE(5, 13)
     QByteArray name() const override;
+#endif
 
     static bool canRead(QIODevice *device);
 
diff --git a/src/plugins/imageformats/tiff/qtiffhandler.cpp b/src/plugins/imageformats/tiff/qtiffhandler.cpp
index cd70fb9..3d404bd 100644
--- a/src/plugins/imageformats/tiff/qtiffhandler.cpp
+++ b/src/plugins/imageformats/tiff/qtiffhandler.cpp
@@ -805,10 +805,12 @@ bool QTiffHandler::write(const QImage &image)
     return true;
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 QByteArray QTiffHandler::name() const
 {
     return "tiff";
 }
+#endif
 
 QVariant QTiffHandler::option(ImageOption option) const
 {
diff --git a/src/plugins/imageformats/tiff/qtiffhandler_p.h b/src/plugins/imageformats/tiff/qtiffhandler_p.h
index 2090e38..c2eb412 100644
--- a/src/plugins/imageformats/tiff/qtiffhandler_p.h
+++ b/src/plugins/imageformats/tiff/qtiffhandler_p.h
@@ -55,7 +55,9 @@ public:
     bool read(QImage *image) override;
     bool write(const QImage &image) override;
 
+#if QT_DEPRECATED_SINCE(5, 13)
     QByteArray name() const override;
+#endif
 
     static bool canRead(QIODevice *device);
 
diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
index 04cfbdb..0c42749 100644
--- a/src/plugins/imageformats/tiff/tiff.pro
+++ b/src/plugins/imageformats/tiff/tiff.pro
@@ -4,9 +4,11 @@ HEADERS += qtiffhandler_p.h
 SOURCES += main.cpp qtiffhandler.cpp
 OTHER_FILES += tiff.json
 
-config_libtiff {
-    unix|mingw: LIBS += -ltiff
-    else:win32: LIBS += libtiff.lib
+include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri)
+QT_FOR_CONFIG += imageformats-private
+
+qtConfig(system-tiff) {
+    QMAKE_USE_PRIVATE += tiff
 } else {
     include($$PWD/../../../3rdparty/libtiff.pri)
 }
diff --git a/src/plugins/imageformats/webp/qwebphandler.cpp b/src/plugins/imageformats/webp/qwebphandler.cpp
index 578a701..4d6bcbe 100644
--- a/src/plugins/imageformats/webp/qwebphandler.cpp
+++ b/src/plugins/imageformats/webp/qwebphandler.cpp
@@ -310,10 +310,12 @@ bool QWebpHandler::supportsOption(ImageOption option) const
         || option == BackgroundColor;
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 QByteArray QWebpHandler::name() const
 {
     return QByteArrayLiteral("webp");
 }
+#endif
 
 int QWebpHandler::imageCount() const
 {
diff --git a/src/plugins/imageformats/webp/qwebphandler_p.h b/src/plugins/imageformats/webp/qwebphandler_p.h
index 950b501..31574b4 100644
--- a/src/plugins/imageformats/webp/qwebphandler_p.h
+++ b/src/plugins/imageformats/webp/qwebphandler_p.h
@@ -56,7 +56,9 @@ public:
     ~QWebpHandler();
 
 public:
+#if QT_DEPRECATED_SINCE(5, 13)
     QByteArray name() const override;
+#endif
 
     bool canRead() const override;
     bool read(QImage *image) override;