From 633522cb007f41bf37de996cf12bd93b3bf744c0 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Tue, 30 Jul 2019 11:25:41 +0300 Subject: Add changes file for Qt 5.13.1 + 626c3053efd7905080ac4a65fca55551391a36e3 Fix feature and library checks for tiff and mng + 311a521df449554a24555d3603cef365550ea254 Bump version + 43ca053b50d7ed663c6734879070186bf28a0d29 Add changes file for Qt 5.12.4 + d2c5409c1a4994052fd0c470148f1cd38f908d1c Bump version + 7bdf0823b64e53a90f7a54151afada3aaceb7ba1 Bump version + 7ad0ef0f31afd89509dc2cb3c102b22c0e6c725c Fix compilation with disabled deprecated APIs + 2e1d4d9bf2804c842feeafefb7b42051417b68ab Doc: Replace example file lists with links to code.qt.io + d4861c2a836f323e1c4694bf7830e69ef845b8ce Update bundled libwebp to version 1.0.3 Change-Id: I4fe29b52bfcdcc1525f29b934240b7c991de83e6 Reviewed-by: Eirik Aavitsland --- dist/changes-5.13.1 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 dist/changes-5.13.1 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 -- cgit v1.2.3 From 53f8fd57b698b97aded363700306fe61c4b9ea17 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Tue, 20 Aug 2019 13:16:24 +0300 Subject: Add changes file for Qt 5.12.5 + 7bdf0823b64e53a90f7a54151afada3aaceb7ba1 Bump version + d4861c2a836f323e1c4694bf7830e69ef845b8ce Update bundled libwebp to version 1.0.3 + 9100cc7ab04586890fb8f1924b0e06ad3efa7d3e Reapply: Fix building with clang_cl Change-Id: Ia9b554003c3925ae570e23eff37d2ab06e4925c5 Reviewed-by: Eirik Aavitsland --- dist/changes-5.12.5 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 dist/changes-5.12.5 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 -- cgit v1.2.3 From 02759551f6f5aa0f365fecc4d880901e42908675 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 18 Sep 2019 14:38:47 +0200 Subject: Fix and re-work compile tests The compile tests were seriously broken, and we didn't notice, because configure leniently ignores the second level "test" object and the inline sources provide the absolute path. Merge the 2nd level test objects with the right ones. Remove superfluous label entries. Remove superfluous qmake entries. The inline sources already provide the right -l argument. Remove superfluous return statements. The generated main function already returns 0. Remove superfluous "type" entry, because "compile" is the default anyways. Note that the jasper version test is bogus, because these are compile tests that are not actually executed. The reference to JAS_VERSION is kept to test for existence of this define. Fixes: QTBUG-78473 Change-Id: I1d4fa634e29329cfc34c0a2f78b2eb730ef84d50 Reviewed-by: Liang Qi --- src/imageformats/configure.json | 156 +++++++++++++++------------------------- 1 file changed, 59 insertions(+), 97 deletions(-) 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" -- cgit v1.2.3