Merge "Merge remote-tracking branch 'origin/5.15' into dev"

3 files changed, 107 insertions, 97 deletions

diff --git a/dist/changes-5.12.5 b/dist/changes-5.12.5
new file mode 100644
index 0000000..dd232ff
--- /dev/null
+++ b/dist/changes-5.12.5
@@ -0,0 +1,24 @@
+Qt 5.12.5 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.4.
+
+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.
+
+****************************************************************************
+*                             Third-Party Code                             *
+****************************************************************************
+
+ - Update bundled libwebp to version 1.0.3
diff --git a/dist/changes-5.13.1 b/dist/changes-5.13.1
new file mode 100644
index 0000000..9716883
--- /dev/null
+++ b/dist/changes-5.13.1
@@ -0,0 +1,24 @@
+Qt 5.13.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.13.0.
+
+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.
+
+****************************************************************************
+*                             Third-Party Code                             *
+****************************************************************************
+
+ - Update bundled libwebp to version 1.0.3
diff --git a/src/imageformats/configure.json b/src/imageformats/configure.json
index 7c6eaef..4724d86 100644
--- a/src/imageformats/configure.json
+++ b/src/imageformats/configure.json
@@ -16,133 +16,95 @@
 
     "libraries": {
         "jasper": {
-            "label": "jasper",
+            "headers": "jasper/jasper.h",
             "test": {
-                "label": "Jasper(header in /usr/include)",
-                "type": "compile",
-                "test": {
-                    "include": [
-                        "string.h",
-                        "jasper/jasper.h"
-                    ],
-                    "qmake": [
-                        "msvc: LIBS += libjasper.lib",
-                        "else: LIBS += -ljasper"
-                    ],
-                    "main": [
-                        "// This version of Jasper is broken, according to the old Qt Solutions docs",
-                        "if (strcmp(JAS_VERSION, \"1.900.0\") == 0)",
-                        "    return 1;",
-                        "return 0;"
-                    ]
-                }
+                "include": [
+                    "string.h",
+                    "jasper/jasper.h"
+                ],
+                "main": [
+                    "// This version of Jasper is broken, according to the old Qt Solutions docs",
+                    "if (strcmp(JAS_VERSION, \"1.900.0\") == 0)",
+                    "    return 1;"
+                ]
             },
             "sources": [
                 "-ljasper"
             ]
         },
         "mng": {
-            "label": "mng",
+            "headers": "libmng.h",
             "test": {
-                "label": "MNG(header in /usr/include)",
-                "type": "compile",
-                "test": {
-                    "include": [
-                        "stdio.h",
-                        "libmng.h"
-                    ],
-                    "qmake": [
-                        "LIBS += -lmng"
-                    ],
-                    "main": [
-                        "mng_handle hMNG;",
-                        "mng_cleanup(&hMNG);",
+                "include": [
+                    "stdio.h",
+                    "libmng.h"
+                ],
+                "main": [
+                    "mng_handle hMNG;",
+                    "mng_cleanup(&hMNG);",
                     "#if defined(MNG_VERSION_MAJOR)",
                     "#if MNG_VERSION_MAJOR < 1 || (MNG_VERSION_MAJOR == 1 && MNG_VERSION_MINOR == 0 && MNG_VERSION_RELEASE < 9)",
                     "#error System libmng version is less than 1.0.9",
                     "#endif",
-                    "#endif",
-                        "return 0;"
-                    ]
-                }
+                    "#endif"
+                ]
             },
             "sources": [
                 "-lmng"
             ]
         },
         "tiff": {
-            "label": "tiff",
+            "headers": "tiffio.h",
             "test": {
-                "label": "TIFF(header in /usr/include)",
-                "type": "compile",
-                "test": {
-                    "include": "tiffio.h",
-                    "qmake": [
-                        "unix|mingw: LIBS += -ltiff",
-                        "else:win32: LIBS += libtiff.lib"
-                    ],
-                    "main": [
-                        "#if !defined(TIFF_VERSION) && defined(TIFF_VERSION_CLASSIC)",
-                        "// libtiff 4.0 splits it into TIFF_VERSION_CLASSIC and TIFF_VERSION_BIG",
-                        "#    define TIFF_VERSION TIFF_VERSION_CLASSIC",
-                        "#endif",
-
-                        "#if !defined(TIFF_VERSION)",
-                        "#    error \"Required libtiff not found\"",
-                        "#elif TIFF_VERSION < 42",
-                        "#    error \"unsupported tiff version\"",
-                        "#endif",
+                "main": [
+                    "#if !defined(TIFF_VERSION) && defined(TIFF_VERSION_CLASSIC)",
+                    "// libtiff 4.0 splits it into TIFF_VERSION_CLASSIC and TIFF_VERSION_BIG",
+                    "#    define TIFF_VERSION TIFF_VERSION_CLASSIC",
+                    "#endif",
 
-                        "tdata_t buffer = _TIFFmalloc(128);",
-                        "_TIFFfree(buffer);",
+                    "#if !defined(TIFF_VERSION)",
+                    "#    error \"Required libtiff not found\"",
+                    "#elif TIFF_VERSION < 42",
+                    "#    error \"unsupported tiff version\"",
+                    "#endif",
 
-                        "// some libtiff implementations where TIFF_VERSION >= 42 do not",
-                        "// have TIFFReadRGBAImageOriented(), so let's check for it",
-                        "TIFFReadRGBAImageOriented(0, 0, 0, 0, 0, 0);",
+                    "tdata_t buffer = _TIFFmalloc(128);",
+                    "_TIFFfree(buffer);",
 
-                        "return 0;"
-                    ]
-                }
+                    "// some libtiff implementations where TIFF_VERSION >= 42 do not",
+                    "// have TIFFReadRGBAImageOriented(), so let's check for it",
+                    "TIFFReadRGBAImageOriented(0, 0, 0, 0, 0, 0);"
+                ]
             },
             "sources": [
                 "-ltiff"
             ]
         },
         "webp": {
-            "label": "webp",
+            "headers": [
+                "webp/decode.h",
+                "webp/encode.h",
+                "webp/demux.h",
+                "webp/mux.h"
+            ],
             "test": {
-                "label": "WebP(header in /usr/include)",
-                "type": "compile",
-                "test": {
-                    "include": [
-                        "webp/decode.h",
-                        "webp/encode.h",
-                        "webp/demux.h",
-                        "webp/mux.h"
-                    ],
-                    "qmake": [
-                        "LIBS += -lwebp -lwebpdemux -lwebpmux"
-                    ],
-                    "main": [
-                        "#if WEBP_ABI_IS_INCOMPATIBLE(WEBP_DECODER_ABI_VERSION, 0x0203) || WEBP_ABI_IS_INCOMPATIBLE(WEBP_ENCODER_ABI_VERSION, 0x0202)",
-                        "#error \"Incompatible libwebp version\"",
-                        "#endif",
-
-                        "WebPDecoderConfig config;",
-                        "WebPDecBuffer *output_buffer = &config.output;",
-                        "WebPBitstreamFeatures *bitstream = &config.input;",
-                        "WebPPicture picture;",
-                        "picture.use_argb = 0;",
-                        "WebPConfig config2;",
-                        "config2.lossless = 0;",
-                        "WebPData data = {};",
-                        "WebPDemuxer *demuxer = WebPDemux(&data);",
-                        "WebPIterator iter;",
-                        "iter.frame_num = 0;",
+                "main": [
+                    "#if WEBP_ABI_IS_INCOMPATIBLE(WEBP_DECODER_ABI_VERSION, 0x0203) || WEBP_ABI_IS_INCOMPATIBLE(WEBP_ENCODER_ABI_VERSION, 0x0202)",
+                    "#error \"Incompatible libwebp version\"",
+                    "#endif",
 
-                        "return 0;"
-                    ]
-                }
+                    "WebPDecoderConfig config;",
+                    "WebPDecBuffer *output_buffer = &config.output;",
+                    "WebPBitstreamFeatures *bitstream = &config.input;",
+                    "WebPPicture picture;",
+                    "picture.use_argb = 0;",
+                    "WebPConfig config2;",
+                    "config2.lossless = 0;",
+                    "WebPData data = {};",
+                    "WebPDemuxer *demuxer = WebPDemux(&data);",
+                    "WebPIterator iter;",
+                    "iter.frame_num = 0;"
+                ]
             },
             "sources": [
                 "-lwebp -lwebpdemux -lwebpmux"