summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.12.7v5.12.7Antti Kokko2020-01-171-0/+20
| | | | | | | + e94a9f2badc82f9b8aba094cf7d73fe7f86c3ee1 Bump version Change-Id: Ie3a53cdef5c60f295c15de4240ad2d1426a51257 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Merge remote-tracking branch 'origin/5.12.6' into 5.12Qt Forward Merge Bot2020-01-071-0/+24
|\ | | | | | | Change-Id: I859151ba9b42a579c57cc03997fbcb632802d754
| * Update changes file for 5.12.6v5.12.6Eirik Aavitsland2019-11-071-3/+2
| | | | | | | | | | Change-Id: I781f76b8b57445cade3a19a510cc99e9d0b59e94 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Merge 5.12 into 5.12.6Kari Oikarinen2019-11-0731-712/+2630
| |\ | | | | | | | | | Change-Id: Icfbebe5c86f6c8958f1fc60f98a034d9e338e076
| * | Add changes file for Qt 5.12.6Antti Kokko2019-11-051-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | + 2378a4b6228907e8428f613d2e625601550bfe21 Tiff: Include two upstream CVE fixes in bundled libtiff + b722026bd89c2c0e5688131a257a5c24e70a16ed Bump version Change-Id: Icce928844b6f4385ec88c13072e55b6fa56def10 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Bump versionFrederik Gladhorn2019-11-071-1/+1
| |/ |/|
* | Update bundled libtiff to version 4.1.0Eirik Aavitsland2019-11-0631-712/+2630
|/ | | | | | | | [ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.1.0 Change-Id: I3e841863c5cf8588bf62b6520f34e64909394998 (cherry picked from commit ba1fb21bc61a2075c7fd058e7f7ba5caf7d2f400) Reviewed-by: Liang Qi <liang.qi@qt.io>
* Bump versionFrederik Gladhorn2019-10-301-1/+1
|
* Tiff: Include two upstream CVE fixes in bundled libtiffEirik Aavitsland2019-10-308-112/+91
| | | | | | | | | | | | | | | | | | | For issues CVE-2019-17546 and CVE-2019-14973, the following commits were merged into the bundled libtiff: 4bb584a35f87af42d6cf09d15e9ce8909a839145 RGBA interface: fix integer overflow potentially causing write heap buffer overflow, especially on 32 bit builds. Fixes https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=16443. Credit to OSS Fuzz 1b5e3b6a23827c33acf19ad50ce5ce78f12b3773 Fix integer overflow in _TIFFCheckMalloc() and other implementation-defined behaviour (CVE-2019-14973) (cherry picked from commit 9fe1f2e918d39031852805f1add23125c061d3c3) Change-Id: Ia98d381bb677fcd167724895515eb3fdecee9709 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+24
|\
| * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+24
|/| | | | | | | Change-Id: I0d8316ac3fe4db44042d3b8be90bb04deb9bcd70
| * Add changes file for Qt 5.12.5v5.12.5Antti Kokko2019-08-231-0/+24
|/ | | | | | | | | + 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 <eirik.aavitsland@qt.io>
* Reapply: Fix building with clang_clAllan Sandfeld Jensen2019-07-311-3/+3
| | | | | | | | This fix was mistakenly overwritten by the recent 1.0.3 upgrade. Change-Id: Ifcfeeac075d97d770de471380c506fb739f0b52a (cherry picked from commit dbfcea2a638d9223bb8d4d9ffc63b0d294b9f97d) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update bundled libwebp to version 1.0.3André Klitzing2019-07-2246-346/+532
| | | | | | | | [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.0.3 Change-Id: I7aef89e209923af0e516024c26ebce4a8158d4d1 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | Change-Id: Ide8cae87ec1c714b818d7c82cd481f52570a733d
* Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+29
|\
| * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+29
|/| | | | | | | Change-Id: I2257338a1b5fe8d069ac51011a1de5e26e02611c
| * Add changes file for Qt 5.12.4v5.12.4Antti Kokko2019-05-241-0/+28
| | | | | | | | | | Change-Id: I6f3f2b3c3a231ac661c0f5e9d5feeb6f7e09f2de Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Bump versionFrederik Gladhorn2019-05-231-1/+1
|/ | | | Change-Id: I3db405cb4a9a524b8343a5cf5c11b615b9bcb1a9
* Fix feature and library checks for tiff and mngJoerg Bornemann2019-05-132-5/+9
| | | | | | | This amends commit a33e3aea. Change-Id: I03304f5bf300e5e52476c3f3d6b06b0815009720 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+31
|\ | | | | | | Change-Id: I266e94316aa280198572a718ea8bd6157a56ba2e
| * Add changes file for Qt 5.12.3v5.12.3Antti Kokko2019-04-021-0/+31
| | | | | | | | | | | | | | | | | | + 4b0d658f47ec80e3d7a5b66c060efe9a9ef5289a Bump version + 0989f6aa2d45426c10bcfd60272486a8b34c8e44 tiff handler: fix compilation failure + 434aa248ad5710c7f65283fc3beb7e8adb8b1ad7 Heic handler: fix orientation and other image properties Change-Id: Icaffd1c0351fa5e816f93c79da1de55ea7f577e5 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Fix -no-gui buildJoerg Bornemann2019-04-121-0/+1
| | | | | | | | | | | | | | Change-Id: I57639389880e5c73025ffe3db9f411fc5b0e78e8 Fixes: QTBUG-75113 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Remove the QT_NO_IMAGEFORMAT_{TIFF|WEBP} definesJoerg Bornemann2019-04-023-10/+2
| | | | | | | | | | | | | | They are #undef'ed anyway. Change-Id: Ic1cb3c09b5849f16115d8514fef471825d564f2c Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Move qtimageformats over to the new config systemLiang Qi2019-04-0216-229/+244
| | | | | | | | | | | | | | Task-number: QTBUG-44318 Task-number: QTBUG-62259 Change-Id: Ide5c28015c46b12ee3f21d06badd69db8bed1281 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Fix building with clang_clAllan Sandfeld Jensen2019-04-011-3/+3
|/ | | | | | | | | Clang reports itself as MSVC but doesn't allow intrinsics to be used unconditionally independent of command-line flags like MSVC does. Fixes: QTBUG-68551 Change-Id: I65d1ee1aa5c02b7c3a25c10c69c3d5e88129b858 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Heic handler: fix orientation and other image propertiesEirik Aavitsland2019-03-267-49/+287
| | | | | | | | | | The mac heic handler lacked support for any meta-data i/o. Most notably, the image orientation proprty was ignored, so images read in could be wrongly oriented. Fixes: QTBUG-73415 Change-Id: I779f91dc28c7441b124aab4557e1abcd3e69fde9 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* tiff handler: fix compilation failureEirik Aavitsland2019-03-251-1/+1
| | | | | | | | | Avoid using the tmsize_t type, since it may not be defined. Fixes: QTBUG-74283 Change-Id: I63a496173ec08c6ceac569c516d11a4711e32649 Reviewed-by: Richard Öhlinger <richard.oehlinger@adbsafegate.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Bump versionKari Oikarinen2019-03-211-1/+1
| | | | Change-Id: I6ed160d21aa58a73af959da17e9db7284eb67ad4
* Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+24
|\ | | | | | | Change-Id: Ie6a8107de26d129e4d93471d7ca6e6180ba4301a
| * Add changes file for Qt 5.12.2v5.12.2Antti Kokko2019-02-251-0/+24
|/ | | | | | | | + 50f6698117c2259bdd78868620908eec79e09561 Bump version + 0e8422bedc8c84ff7c08c6b3163329e82c2007dd Update bundled libwebp to version 1.0.2 Change-Id: I32217b3cc2336c930278af3be8d95dda85ed5f88 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Update bundled libwebp to version 1.0.2André Klitzing2019-02-0421-165/+530
| | | | | | | | [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.0.2 Change-Id: I12e1557cef6e592c8c2ca417ef87f6df35a7b410 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-0/+25
|\ | | | | | | Change-Id: I29bc61b996eac4cb7e0e3cddee2384b4e7fe4238
| * Add changes file for Qt 5.12.1v5.12.1Antti Kokko2019-01-091-0/+25
| | | | | | | | | | | | | | | | | | | | | | + 2f61f401187d55bb0304591f27792a63a38db00e Bump version + 0c8d172cf34f442a1318388f751d7e0f652d7072 Update bundled libwebp to version 1.0.1 + 43403038cf75086409bf7ee485ae855fd4c1c1e1 Update bundled libtiff to version 4.0.10 + 335dc6af7d24c1731cbd7e03a21e66c70d81760d Add changes file for Qt 5.11.3 + cbdabc6a23d9ac66c7361a4437f649aacab7d900 Bump version Change-Id: I825bca621f36828296be9fab4bab4123aec59747 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Bump versionKari Oikarinen2019-01-141-1/+1
|/ | | | Change-Id: Ibd92992bbf1cc5ab6ddfe10872838b47a970645e
* Bump versionKari Oikarinen2019-01-071-1/+1
| | | | Change-Id: I0b0ad828fc464b89844636ab34ce6a30f6457367
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-11136-864/+1719
|\ | | | | | | Change-Id: Ib84ba922bb21f9e6c52c3096e7ae0fc10025c202
| * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-04136-864/+1719
| |\ | | | | | | | | | Change-Id: I5ef5083941390a0b9d9fe59b63a744e5a1aecf18
| | * Add changes file for Qt 5.11.3v5.11.3Antti Kokko2018-11-241-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 43403038cf75086409bf7ee485ae855fd4c1c1e1 Update bundled libtiff to version 4.0.10 + 0c8d172cf34f442a1318388f751d7e0f652d7072 Update bundled libwebp to version 1.0.1 + 7cfe47a8fe2f987fb2a066a696fb3d9d0afe4d65 TGA handler: check for out of range image size + 80017a1c7f829355edce61d5d50196cd1e13dcdd Bundled libtiff: add a number of security-related upstream patches + 8455ab6cb29fcccf44977c517689a8ad26781140 tiffhandler: improve stripsize + 2f61f401187d55bb0304591f27792a63a38db00e Bump version Change-Id: If31999c0f727ce8b73e5ffb35e247d1106011bb9 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | * Update bundled libtiff to version 4.0.10Eirik Aavitsland2018-11-1967-469/+987
| | | | | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.0.10 Change-Id: Ib1908d09fc5847381cb03418de878fafd2001a30 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Update bundled libwebp to version 1.0.1André Klitzing2018-11-1968-395/+700
| |/ | | | | | | | | | | | | [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.0.1 Change-Id: Ieccb9f7c0023e6f6591b6093eead9f6940be3210 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+43
|\ \ | | | | | | | | | Change-Id: If23873da11d13d8309efe25240269f9d11889ee3
| * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0-beta4v5.12.0Antti Kokko2018-10-311-0/+43
| | | | | | | | | | | | | | | Change-Id: I016e1d4158385e185248802699f9e04721e9e10a Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: .qmake.conf Change-Id: I0817b4aa191d2523f65242043ca547a20d020f75
| * Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | Change-Id: I4c7777870ba33b26f3808eb3211b795138e6f74f
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-271-5/+14
|\| | | | | | | Change-Id: I56fb4e7a178ac79c75a846d9a7bcd8f1f3533673
| * tiffhandler: improve stripsizeEirik Aavitsland2018-10-251-5/+14
| | | | | | | | | | | | | | | | | | | | libtiff's default stripsize is tiny (8KB), so splitting the image into such strips on writing would significantly hurt the compression rate. Aim for 4MB strips instead. Task-number: QTBUG-70820 Change-Id: I07a9a8c81edf62e802b4ae8d6729a76df15e42ac Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Remove bundled, unmaintained libjasper source codev5.12.0-beta3Eirik Aavitsland2018-10-15121-42492/+7
| | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] The unmaintained bundled libjasper has been removed. Building the jp2 handler will require libjasper to be present as a system or external library. Change-Id: Ic48cc6021fc5fb64fb369eb9621fd7a811e8e9f7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-134-10/+31
|\| | | | | | | Change-Id: If9cf53dac5e906350e652e52842f3b54bc3fe65f
| * Bundled libtiff: add a number of security-related upstream patchesEirik Aavitsland2018-10-124-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This comprises the following libtiff commits, related to the listed CVEs: 3719385a3fac5cfb20b487619a5f08abbf967cf8 CVE-2017-11613 7a092f8af2568d61993a8cc2e7a35a998d7d37be CVE-2017-11613 de144fd228e4be8aa484c3caf3d814b6fa88c6d9 CVE-2018-10963 58a898cb4459055bb488ca815c23b880c242a27d CVE-2018-8905 981e43ecae83935625c86c9118c0778c942c7048 CVE-2018-10779 [ChangeLog][TIFF] A number of security-related upstream patches has been applied to the bundled libtiff Change-Id: I3def9a9b91d0dd2cfd959c5e83d972beed9394d6 Reviewed-by: Liang Qi <liang.qi@qt.io>