summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.14' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.05.15.0Qt Forward Merge Bot2020-04-270-0/+0
|\ | | | | | | Change-Id: I57ad7188b713f6ec968d043fc4a45f0068cb82e4
| * Use pkg-config to find dependencies5.14Marius Kittler2020-04-260-0/+0
| | | | | | | | | | Change-Id: Ia13ec4d78430bfe819f19a2ed2ca4ee467e6b64f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.15' into 5.15.0Qt Forward Merge Bot2020-04-221-0/+20
|\ \ | | | | | | | | | Change-Id: I92d9b6acc9c4bfebd67e5d0f239b4bd3ed81a8cb
| * \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | |/ | | | | | | Change-Id: Ibdf7136171be1984ec14dad371aaeae37147eb6f
| | * Merge remote-tracking branch 'origin/5.14.2' into 5.14Qt Forward Merge Bot2020-04-211-0/+20
| | |\ | | | | | | | | | | | | Change-Id: Iba96ef877173425c5182311db6c74ac4d1500ac6
| | | * Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-101-0/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | + 3e6d52b5628178c0ee1acac562403a2de7833a53 Fix rendering errors with animated webp files + 4defbd4c1b8a6450d690b11e98ae3e1f93cc96d6 Bump version + 9584748fc6847240fd6b748e6735e91e451b8958 Fix NEON support on Android armeabi-v7a for webp + 0c4d4dc12a68124451113e21d2c4fdc5d06d01d0 tiff: do not try to read 32bpc as 16bpc Change-Id: I915558b2ec890e28de928333a729497ac100fa46 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | Add changes file for Qt 5.15.0Antti Kokko2020-04-201-0/+28
|/ / | | | | | | | | | | | | | | | | | | | | | | + 80d2bdc2360be17e4ef5186f6015f10b7b32fa91 Bump version + f00c3c2ef6686eed556b30e8e7145c9bbb851a3f Avoid initializing QFlags with 0 or nullptr + 6124b900d9507687c21e43e68f495bbee9d8d45b Add support for reading BigTIFF + 5a1a12b0e135eb49f7b232c729859583b76bd507 Remove overrides of QImageIOHandler::name() + 45045a1097ad983d75e4f1ea9a32e61844430a60 Update bundled libwebp to version 1.1.0 + 7625a06bd7bfcf77e896086d049b334f1b66c75d winrt: Enable webp for winrt arm configurations Change-Id: I370af0266acc802ee14e9bd7bcf750d48e26fff1 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | winrt: Enable webp for winrt arm configurationsv5.15.0-beta4v5.15.0-beta3Oliver Wolff2020-03-281-1/+1
| | | | | | | | | | | | | | | | | | The fix from upstream has landed in Qt so that webp can now be enabled for that configuration as well. Task-number: QTBUG-71251 Change-Id: I772decad30c91c6e028af05bdba0601ebd1574df Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Update bundled libwebp to version 1.1.0Eirik Aavitsland2020-03-2733-85/+166
| | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.1.0 Change-Id: Id41e437610947b9e6b86205317a469b052dccb5d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Remove overrides of QImageIOHandler::name()v5.15.0-beta2Shawn Rutledge2020-03-0316-83/+0
| | | | | | | | | | | | | | | | | | | | Since name() returns format() by default, these haven't been necessary for a long time. We will remove the base class function in Qt 6, so we should remove the overrides and other uses now to ensure that it will be OK. Followup to 7ad0ef0f31afd89509dc2cb3c102b22c0e6c725c. Change-Id: If3b83a36a36747f8e57775053166edd98512e684 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-251-2/+2
|\ \ | |/ | | | | Change-Id: Ib2aaec7a6d8a1bf6f7201c55f0871c0aa27d02a4
| * tiff: do not try to read 32bpc as 16bpcEirik Aavitsland2020-02-241-2/+2
| | | | | | | | | | | | | | | | | | The header reader would assume that bits per sample above 8 had to be 16, but other values are also possible, so check explicitly. Fixes: QTBUG-82412 Change-Id: I7f0799de4d4cdc84023a34900aa595a7bf73eca1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1Qt Forward Merge Bot2020-02-151-1/+1
|\ \ | |/ | | | | Change-Id: I6bc111acb8e9a296404466f80f051a969bca5ddd
| * Fix NEON support on Android armeabi-v7a for webpAndré Klitzing2020-02-061-1/+1
| | | | | | | | | | | | | | | | Sibling of caef33ae2df64eb397eadfc4ce4735545ff93ea5 Task-number: QTBUG-81461 Change-Id: I26bb7b65c9d25952d338f5684e145f91eb9695a8 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I25aab73ceef95d11a23e4fb2ac1c6c4c84f7e134
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: I294164efd7167b6b0448365a1847ca67db97c378
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\ \ | |/ | | | | Change-Id: I5c6c4a0d467c5069e1a9efb41887d213e5baa4f3
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\ | | | | | | | | | Change-Id: I06d5ed9a742256dde05b8943d0b597b58ca6424b
| | * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-151-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + b46081e233c18026c15504e07bb9c0c9f228906b Bump version + ad587da5460a2c8ca90422dc3d61f0e16ec6e7c2 Use pkg-config to find dependencies + 80249142d9407cb355c2a0bd5cbbdaa6800f8aba Disable the webp plugin for winrt on ARM + 90f384644991b72728202b0a3edf6b079ba6989a winrt: Disable libtiff for x86 configurations + 31338f220f1ad1d0b8c050c48b04e733c4b62e1b Do not explicitly disable plugins for winrt Change-Id: If05edcfd3a8f556c9988df4a31f7f62845d09d23 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-211-2/+14
|\ \ \ | |/ / | | | | | | Change-Id: Ie91dbdde92b2b87b60b4861234be718410154ff4
| * | Fix rendering errors with animated webp filesMichael Brasser2020-01-201-2/+14
| |/ | | | | | | | | | | | | | | | | * Respect blend_method. * Apply dispose_method when rending the *next* frame, and only for the given frame area. Change-Id: I60a8c7010a46a2a66339c87f74927a02aee7dcf3 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-302-12/+10
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I89d7e0498ff3f7818bfe8c1a3a6da3c9440ab30a
| * Do not explicitly disable plugins for winrtOliver Wolff2019-12-171-6/+0
| | | | | | | | | | | | | | | | | | | | The ability of building these plugins is part of configure.json and should not be hard coded. The plugins can be built for winrt. Fixes: QTBUG-71251 Change-Id: I9a6b0dcdd031d37339282caab4596978c52ae5a0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * winrt: Disable libtiff for x86 configurationsOliver Wolff2019-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | For some reason the build of libtiff fails during linking for x86 configurations (unresolved symbols GetFileSize & CreateFile) while it works as expected for x64 and arm. Disable that configuration, but keep support for working scenarios. Task-number: QTBUG-71251 Change-Id: I181a42378584af8c2fffccbb3ddd252e4a057dfb Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Disable the webp plugin for winrt on ARMOliver Wolff2019-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | There is a bug in libwebp which prevents building the plugin for an ARM winrt configuration. Until the bug is fixed upstream, the feature should not be available for these configurations. Task-number: QTBUG-71251 Change-Id: I10313d4fe63dc25cefed3153d9acf1f3b12c05a4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Use pkg-config to find dependenciesMarius Kittler2019-12-171-4/+8
| | | | | | | | | | Change-Id: Ifa826410494f65a560fe8dea999d4665f2f1191b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | Change-Id: I77aa4c0aaf3485b55f63ef2ce166aed3d00c8c53
* | Add support for reading BigTIFFEirik Aavitsland2019-12-207-3/+41
| | | | | | | | | | | | | | | | | | | | | | All recent versions of libtiff has support for the 64bit-indexed BigTIFF format. Allow reading it by recognizing its magic number. [ChangeLog][TIFF] Add support for reading BigTIFF Fixes: QTBUG-80538 Change-Id: I7fcb72d77e4a0bdcb38ab96e9f6cfaff7cf4ad49 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+35
|\ \ | |/ | | | | Change-Id: I47ca01320eac084f90efa4ff0b75dfa07f02a5a8
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+35
| |\ | | | | | | | | | Change-Id: I6db8e12122571c023ec9f46d61014f16c62cdfc4
| | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.05.14.0Antti Kokko2019-11-191-0/+35
| |/ | | | | | | | | Change-Id: I732c5ea27eb048dadd29bc7756d94907567f312c Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-229-28/+28
| | | | | | | | | | | | | | It is being deprecated. Change-Id: I550c7f757567dbcc914e6869c29563b4f3e76a52 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-1231-712/+2630
|\ \ | |/ | | | | Change-Id: I48926bf0b3f2dac7806ff30e06e5e317c7fe018c
| * Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-11-0931-712/+2630
| |\ | | | | | | | | | Change-Id: Iaaf98e10d41867b2c6ceda89cb5c9c315301190b
| | * Update bundled libtiff to version 4.1.05.13Eirik Aavitsland2019-11-0631-712/+2630
| | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.1.0 Change-Id: I3e841863c5cf8588bf62b6520f34e64909394998 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-0210-115/+120
|\ \ \ | |/ / | | | | | | Change-Id: Ib896fdc009ad12ecb45bad9fa9724c03eb3de7a5
| * | Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-10-309-112/+116
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib4b1a3a3604fdce35f61dadc26770ca9b749e008
| | * Tiff: Include two upstream CVE fixes in bundled libtiffv5.13.25.13.2Eirik Aavitsland2019-10-239-113/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) Fixes: QTBUG-79397 Change-Id: I29257e6dbfbd816224d3dbaefdbe8afecd25f288 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * Add changes file for Qt 5.13.2Antti Kokko2019-10-141-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | + f8b773d1d4b2f153eb97578ba5e49fd43564f7fb Do not try to write too large WebP images + 53f8fd57b698b97aded363700306fe61c4b9ea17 Add changes file for Qt 5.12.5 + ab09c9dd9a93932feedbc99e9e965be5bc852c02 Tiff handler: Improve writing performance for some cases Change-Id: I9c1d6ea8ee0de06edf1ee2924da5c3e6e9bde76c Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | Change-Id: If02646dde21f8350ff51cccfbc3ce4637ad49724
| * | Tiff: Align 16 to 8 bit colormap conversion to libtiffEirik Aavitsland2019-10-291-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For paletted images, tiff stores a color map with 16 bit deep entries. When reading such images, the tiff handler tried to be clever in the 16 to 8 bit mapping, but this resulted in slightly different result than what libtiff itself produces if asked to read and convert such an image (TIFFReadRGBAImageOriented()). libtiff simply ignores the lower 8 bits, so we should do the same. Importantly, this makes no difference when 8 bit original data is stored in the orthodox 16 bit way, where e.g. 0xAB is stored as 0xABAB - like we do. However, the alternative storages 0xAB00 and 0xABFF exist in the wild, even in sample images in Qt repos. Also, if we later should want to support proper 16 bit data here, the previous code was anyway wrong: just dividing with 257 is highly unorthodox. The correct way would be to use proper rounding like QRgba64::toArgb32(). Fixes: QTBUG-79522 Change-Id: I7bd90ad7b89a923bd431781f4927b13ad0544407 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-151-20/+8
|\ \ \ | |/ / | | | | | | Change-Id: I4abef8588f7e8e0e881c3767b80776fd127fde2f
| * | Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2Qt Forward Merge Bot2019-10-121-20/+8
| |\ \ | | |/ | | | | | | Change-Id: I2437b8b4b535e4f02740070e0352e1825c67fa3c
| | * Tiff handler: Improve writing performance for some casesEirik Aavitsland2019-10-091-20/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For 1 byte deep formats, the writing routine went through the copy-and-convert-in-chunks loop for no reason: no conversion was done or needed. For huge images of some formats, the chunk size computation could fail because of int overflow, resulting in suboptimal chunk sizes. Change-Id: I966351d9a8728987c9e885f4949d98ba94d4ac19 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-281-3/+8
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-281-3/+8
| |\ \ \ |/ / / / | | _ / | | / Change-Id: Id1a3c32e1310d4cc0ac0ba7bb74199e285db9c5d
| * | Fix JasPer version checkv5.14.0-beta1v5.14.0-alpha1Joerg Bornemann2019-09-191-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compile test for JasPer tried to check for a certain version number at run time, which is pointless, because we never run this test. Turn the run-time check into a compile-time check. Change-Id: I7c9de67a35edadf6a13b32b0faf48ac728a80fc0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Simon Hausmann2019-09-193-97/+107
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.14' into 5.15Simon Hausmann2019-09-193-97/+107
| |\ \ \ |/ / / / | | _ / | | / Change-Id: I3de8cbea57c59e3c9d448a76ae70507ecfbcfa7c
| * | Fix and re-work compile testsJoerg Bornemann2019-09-181-97/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <liang.qi@qt.io>
View Lorry Controller Status