summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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
* 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>
* 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.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.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>
* | 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>
* | 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>
* | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-09-172-0/+48
|\ \
| * \ Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-172-0/+48
| |\ \ |/ / / | | _ | | Change-Id: Ie333e5ad8a6e481ab651340e409f9b1046c85f9a
| * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+24
| |\
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+24
| | |\ | |/ / | | | | | | Change-Id: I001799846ca4c7c63838f1212ce18d2d00573182
| | * 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.55.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>
| * | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+24
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+24
| | |\ \ | |/ / / | | | | | | | | Change-Id: I1ecf15edfe9e73e63c014b654a1f56e00a69fb14
| | * | Merge 5.13 into 5.13.1v5.13.15.13.1Paul Wicking2019-08-061-3/+3
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I569b9f05bdc70563107c0cd9c9a12812fbd52198
| | * | | Add changes file for Qt 5.13.1Antti Kokko2019-07-311-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 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 <eirik.aavitsland@qt.io>
* | | | | Fix build after QColorSpace API changesTor Arne Vestbø2019-09-052-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iff3186cf4eccae5fc7e7e3c55c5e6eb662be9519 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | | Merge "Merge dev into 5.14 (delayed final downmerge)"Kari Oikarinen2019-09-042-14/+55
|\ \ \ \ \
| * \ \ \ \ Merge dev into 5.14 (delayed final downmerge)Kari Oikarinen2019-09-042-14/+55
| |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replicates the effects of the fast-forward merge that should have been pushed on 2019-08-27 as the final down-merge from dev to 5.14. Task-number: QTBUG-78019 Change-Id: Ied7ff6d61393b0e6db5c5984d8ab735ddaffad72
| * | | | | Support writing WebP color space profilesAllan Sandfeld Jensen2019-08-212-14/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d9473c2866d9792cd8752816a291be04e39ec19 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | | | | Fix Android multi ABIs compilationBogDan Vatra2019-08-281-11/+14
|/ / / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I983e2559d27ab5778f0af16f659786c0d78f4338 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | | | | Read color space from WebPAllan Sandfeld Jensen2019-08-192-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If1b9645fe07fb2cf15dbf2421d6c66b20f02bdb6 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | | | Read/write ICC profile in TIFF pluginAllan Sandfeld Jensen2019-08-172-1/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds reading and writing of embedded color spaces on the TIFF plugin. Change-Id: I53e8a16ff65f7986e9d51a5b543335e27b43e346 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-08-171-0/+4
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-171-0/+4
| |\ \ \ \ \ |/ / / / / / | | _ / / / | | / / / Change-Id: I930f05fee1ac40fae80284c203be501d288ba0d4
| * | | | Do not try to write too large WebP imagesAllan Sandfeld Jensen2019-08-171-0/+4
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | The WebP encoder doesn't check so we end up with undefined behavior. Change-Id: Id3a64b2be50684d07e799f97f64481ba57c02ffb Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-08-061-3/+3
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-061-3/+3
| |\ \ \ \ |/ / / / / | | _ / / | | / / Change-Id: I9b50b4428c3f786c3a7d04a815f871993f2e0cc5
| * | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-08-031-3/+3
| |\ \ \ | | |/ / | |/| |
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-031-3/+3
| | |\ \ | |/ / / | | | _ | | | Change-Id: If594ae6ab8040f90e5ebe754854b412073b734ec
| | * 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>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-3046-346/+532
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-3046-346/+532
| |\ \ \ |/ / / / | | _ / | | / Change-Id: Id014153acea4b1b0c6f9e91d4e4a13ce762a4284
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-2346-346/+532
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-2346-346/+532
| | |\ \ | |/ / / | | | _ | | | Change-Id: I88bbc7ca2384e7fcafeacf72d0b9a74b9c1cc43e
| | * 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>
View Lorry Controller Status