summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | Change-Id: I4c7777870ba33b26f3808eb3211b795138e6f74f
* 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>
* 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>
* Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
|\ | | | | | | Change-Id: Ia939d042682fefbf7774352ebce4b07efa5bb45e
| * Add changes file for Qt 5.11.2v5.11.2Antti Kokko2018-08-311-0/+24
| | | | | | | | | | Change-Id: Id37f327e4b404e20b50ceabcd754b2a61089c793 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * TGA handler: check for out of range image sizeEirik Aavitsland2018-08-291-0/+8
| | | | | | | | | | | | | | | | | | Make the decoder fail early to avoid spending time and memory on attempting to decode a corrupt image file. Change-Id: Iac35e72de743f412a65d11c58fe7faa275dc4e41 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 7cfe47a8fe2f987fb2a066a696fb3d9d0afe4d65)
* | TGA handler: check for out of range image sizeEirik Aavitsland2018-08-281-0/+8
|/ | | | | | | | Make the decoder fail early to avoid spending time and memory on attempting to decode a corrupt image file. Change-Id: Iac35e72de743f412a65d11c58fe7faa275dc4e41 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | Change-Id: If97b37e0b55b7118923429d02ff639487efa2a9b
* Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+34
|\ | | | | | | Change-Id: I2ce9a0ad2904663c6a629ead8041ca61b1eab465
| * Add changes file for Qt 5.11.1v5.11.1Antti Kokko2018-06-091-0/+34
|/ | | | | Change-Id: Iff4c339719bb389db78f558aded1be3baec292d4 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Add changes file for Qt 5.9.5Antti Kokko2018-06-061-0/+24
| | | | | | Change-Id: Iee64c43bdbc7f729ece4f2c6981e130dd80c2010 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit 0267be9dac0eb41b6121b1b9d861094dcd967722)
* Add changes file for Qt 5.9.6Antti Kokko2018-06-061-0/+24
| | | | | | | Change-Id: I8a944434fc17b6c422cce7eb80f950c10aa98873 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit e9daef6d8f60015906c1e62e2875b2b6c1494465) Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Fix tiffhandler: ensure saved tiffs have suitable ROWSPERSTRIP tag setEirik Aavitsland2018-06-061-5/+10
| | | | | | | | | | | | | | When writing an image without compression, libtiff will automatically store it in strips of default size, and add a ROWSPERSTRIP tag accordingly. However, if compression is enabled, libtiff does not do this. The lack of this tag may create trouble for readers. Fix by explicitly setting the tag in all cases. [ChangeLog][TIFF] Ensure saved tiffs have suitable ROWSPERSTRIP tag set Task-number: QTBUG-68609 Change-Id: I838c83be25158d7f13e220098e960010b8cb2789 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | Change-Id: Id6d4d759a40e01d9ee453d1eb25a81e7e93e8c21
* Update bundled libwebp to version 1.0.0Liang Qi2018-05-2256-858/+1693
| | | | | | | | | | | | | | | This commit imports libwebp 1.0.0, including AUTHORS, COPYING, ChangeLog, NEWS, PATENTS, README and src directories. In src, only includes header and source files. Upstream changes since 0.6.1 have been merged in. Also updated version in qt_attribution.json. [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.0.0. Change-Id: Ia30ccc90286d5dd3e48e091f101f1cae84785150 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+30
|\ | | | | | | Change-Id: Ie8bcfd11d5e1d33f51b58cf02d136bf7e3f2286d
| * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.0Antti Kokko2018-04-211-0/+30
|/ | | | | Change-Id: I0acf6b01b1a9e3bbb9a9d116b7f6dc273b2f2861 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update the bundled libwebp to version 0.6.1v5.11.0-beta4Eirik Aavitsland2018-04-12161-5553/+7243
| | | | | | | | Upstream changes since 0.6.0 have been merged in. Also updated version in qt_attribution.json. Change-Id: I6f46bdfe2dd7288dbe61c4d7924309bb435e3928 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Doc: Set empty module header for the documentation projectv5.11.0-beta3Topi Reinio2018-03-281-0/+3
| | | | | | | This prevents a QDoc Clang C++ parser warning about a missing header. Change-Id: Id14b17de72488a12108b583ed0673d0451ff5e15 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta2v5.11.0-beta1Liang Qi2018-02-180-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5e5351525277400a74f2762a91a9c70f8493b6a2
| * Add fix for CVE-2017-18013 of libtiffAndré Klitzing2018-02-091-4/+4
| | | | | | | | | | | | | | http://bugzilla.maptools.org/show_bug.cgi?id=2770 Change-Id: I936b463b37fa922930cf122cfddf842d81ee796e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | Change-Id: Ia4c51b7a1db9d2263a19ccdcc1e29f2ba89ea7e9
* | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-142-4/+30
|\ \ | | | | | | | | | Change-Id: Ifbf48df8a449de12d91631d44cab0320dfd5f699
| * | Add fix for CVE-2017-18013 of libtiffv5.10.1André Klitzing2018-02-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | http://bugzilla.maptools.org/show_bug.cgi?id=2770 Change-Id: I936b463b37fa922930cf122cfddf842d81ee796e Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 25d7e0440f091b39c2865187eb0630045fa20e46)
| * | Add changes file for Qt 5.10.1Antti Kokko2018-02-051-0/+26
| | | | | | | | | | | | | | | | | | Change-Id: I808c94eaa9a66abb899b4620d568688e6378dede Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-1519-54/+164
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If4baad0b1949c1c8f7157c213fc492775053ae0b
| * | Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-1518-54/+140
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I827727fde51a71cbef5d61fb6cc2cd45d5e3bd7c
| | * Add changes file for Qt 5.9.4v5.9.4Antti Kokko2018-01-051-0/+37
| | | | | | | | | | | | | | | Change-Id: I6fab9ad5c689560b662ed97878825211c65bed6c Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Make the native darwin image IO work on iOS tooEirik Aavitsland2017-12-141-17/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | The functions used for converting between QImage and CGImage were not available on iOS. Replace with newer conversions functions which are. Task-number: QTBUG-64722 Change-Id: I3f62d3ccabd103e5b9d4828e8079d94587472872 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: I2c8120b48ce43a74ce85921c63ded74883eed571
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I188f8ceb31364823066ce8882da47225903d3bb0
| | * | Update bundled libtiff to version 4.0.9André Klitzing2017-11-2214-31/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.0.9 Change-Id: I64a56d9b01cc1bb102a3368269ae9915fac5a051 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | * | WebP: Fix wrong default quality level for writingEirik Aavitsland2017-11-162-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a negative (i.e. illegal/unset) quality value was set to the WebP handler, it would just bound it to 0 (minimum quality level). This would happen on every save where no explicit quality level had been requested on the QImageWriter. Fix by copying the jpeg handler's behavior: If a negative value is set, use the default level (75) when storing. [ChangeLog][WebP handler] Fixed default quality level for writing Task-number: QTBUG-64437 Change-Id: I0f1cabba6cea6851c6a813bf5bf7ab8e8c49ddfb Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: I8e7b8901b6bae733028d5b4bb0bda6969b194b8a
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-0/+24
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I5718f51ceff0cdbb7db24afa8b0e6f662f1f56b0
| | * | | Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.0Liang Qi2017-11-211-0/+24
| |/| | | | | | |/ | | |/| | | | | Change-Id: I1993557dbed590871ef322e7315e46d00265abab
| | * | Add changes file for Qt 5.9.3v5.9.3Antti Kokko2017-11-081-0/+24
| | |/ | | | | | | | | | | | | Change-Id: I0700ad34e75240f637e6d17586e65831f58c12d8 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-2050-474/+2695
|\| | | | | | | | | | | Change-Id: If0c8e712f7521483df688ae9d33adea8b5fdaae5
| * | Add changes file for Qt 5.10.0Antti Kokko2017-11-121-0/+27
| | | | | | | | | | | | | | | Change-Id: I8834d6703950d9c105a738e660aaa4399ac8ce4e Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-3049-474/+2668
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I84737121b8915a6c358ad92246984749e2719bed
| | * TGA: Fix clazy-copyable-polymorphicFriedemann Kleint2017-10-191-0/+4
| | | | | | | | | | | | | | | Change-Id: Iba0631701fbecdd66ffa1d12c57387d76aa65475 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | * Update bundled libtiff to version 4.0.8+Eirik Aavitsland2017-10-1944-468/+2608
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This updates the bundled libtiff to release 4.0.8. In addition, since after that release a number of security-related fixes has been added to the upstream CVS repository, this commit comprises the upstream changes of libtiff until 2017-10-10. (Corresponds to commit 46195f7 in the unofficial mirror at github.com/vadz/libtiff.git.) [ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.0.8+ Change-Id: I9f45387ab48383ef2635d60aeda5c74828f1a6fc Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Fix outdated FDL license headerKai Koehne2017-10-171-5/+5
| | | | | | | | | | | | | | | Change-Id: I1e024810b9c5a9fc32986507d263f8b9727f2315 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Merge remote-tracking branch 'origin/5.9.2' into 5.9Liang Qi2017-10-061-0/+24
| | |\ | | | | | | | | | | | | Change-Id: I77cea1554afe0da551acc19111db22c5d4307086
| | | * Add changes file for Qt 5.9.2v5.9.2Eirik Aavitsland2017-09-261-0/+24
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic9bf390feceac545e3ab971dff72ff36b00535e0 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| | * | Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ib87dfcc477d0a0a189e9caf5cb73489b1ad923c2
| | * | Avoid returning void expressionAndré Klitzing2017-10-061-1/+1
| | |/ | | | | | | | | | | | | Change-Id: I32dd4ece07c0ff4ef882fffe69afbe2f4a818a96 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>