summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-142-5/+9
| |\ \ \ | | |/ / | |/| / | | |/ Change-Id: Ia0a5fe32ec96c73758933b319f5cb8f22cc9f344
| | * 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>
* | | Eradicate the last Q_FOREACH and mark the module cleanMarc Mutz2019-07-032-1/+3
| | | | | | | | | | | | | | | | | | | | | ... of Q_FOREACH, Java-style iterators, and QLinkedList use. Change-Id: Ie751d771f226718ae7b8b19e502cbfb49730af3a Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-271-0/+31
|\| | | | | | | | | | | Change-Id: I59a16dc925564db5f0147faad4dca26be8adc288
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-231-0/+31
| |\| | | | | | | | | | Change-Id: Ibad0ab94f0b2ed9bc3182fde979347aeeaf0235b
| | * 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>
* | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-201-0/+1
|\| | | | | | | | | | | | | | | Change-Id: Ia5bd448ef0d2740ff0cdef36a26422569d36584b
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3Qt Forward Merge Bot2019-04-161-0/+1
| |\| | | | | | | | | | | | | | Change-Id: I8ad02040bdd3ce055c48c761b08f9ac1f742a6fa
| | * | 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>
* | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-133-10/+2
|\| | | | | | | | | | | | | | | Change-Id: I8b54bca8b681654369a4b77e3d52204f94c0932d
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2Qt Forward Merge Bot2019-04-093-10/+2
| |\| | | | | | | | | | | | | | Change-Id: I02bc865209f0092c68e5be1542f54e605c517c58
| | * | 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>
* | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-0217-232/+247
|\| | | | | | | | | | | | | | | Change-Id: I9fae9c68d50ff15f6c10773df949c88343aab150
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-0217-232/+247
| |\| | | | | | | | | | | | | | Change-Id: Idd134e350e760a0237dce4ef00d10e1c35dbeb67
| | * | 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>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-308-50/+288
|\| | | | | | | | | | | Change-Id: I0a87eb0db425ea39eb0f037f73850f322b282877
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-278-50/+288
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie44fe655653166bf5a4436aedd80d060afa45d5a
| | * 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.13' into devQt Forward Merge Bot2019-03-191-0/+24
|\| | | | | | | | | | | Change-Id: I18fd84fbb24161f8c34423e3e063001510478bd1
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-0/+24
| |\| | | | | | | | | | Change-Id: I30c4972ee883b9b4aa8b4f615c56d174346e78ae
| | * 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>
* | | Bump versionKari Oikarinen2019-02-251-1/+1
| | | | | | | | | | | | Change-Id: I34aa18d82db1da3041e2b69fbdcb1d79dc2999ed
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-1221-165/+530
|\| | | | | | | | | | | Change-Id: I0e3ad804748b78668751dd1888a04216fdf3c650
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-02-0921-165/+530
| |\| | | | | | | | | | Change-Id: If83b53844d5110c40d94a2e7a6dbfa1f09604f46
| | * 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.13' into devQt Forward Merge Bot2019-02-051-0/+25
|\| | | | | | | | | | | Change-Id: I5557782e04e80d04e4f3dc1057f4e955d7b242ff
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-021-0/+25
|/| | | |/ | | | | Change-Id: Ieeb5bc0259e8e18c46300ec2fbcf02d354565cee
| * 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>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie953fa849567ba6f518f1f309d14643c994bbc43
| * | Bump versionKari Oikarinen2019-01-141-1/+1
| |/ | | | | | | Change-Id: Ibd92992bbf1cc5ab6ddfe10872838b47a970645e
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie540b789353b9c702808aafc1a2f476acd723fad
| * Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: I0b0ad828fc464b89844636ab34ce6a30f6457367
* | Add Grayscale16 support to TIFFAllan Sandfeld Jensen2019-01-034-3/+28
| | | | | | | | | | Change-Id: I927d9ab0af78baf90d8fd8d44088218dff0e7082 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-15136-864/+1719
|\| | | | | | | Change-Id: Ia3396dd92c66c42b8b0d0deba6b57b344a38ad02
| * 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' into devQt Forward Merge Bot2018-12-081-0/+43
|\| | | | | | | | | | | Change-Id: If493c5cec19c69a42834fe4307562781fb23984e
| * | 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.12' into devQt Forward Merge Bot2018-11-170-0/+0
|\| | | | | | | | | | | | | | | Change-Id: I2437905719aeca92ead392ade8b8b64706bcbfc0
| * | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0817b4aa191d2523f65242043ca547a20d020f75