summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.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.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>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-2217-5/+93
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-2217-5/+93
|/| | | | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6df1d00c168de838ef2a42ae528536c684bd631d
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-110-0/+0
| |\ \
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-110-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Idf9f3c89095eb042ce5acf6c2b03fec6b7bbde70
| | | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ide8cae87ec1c714b818d7c82cd481f52570a733d
| * | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| |/ / | | | | | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I1cbe0e8a7ba8c7c53e16747c8a48d8bdf2b2bebf Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * | Fix compilation with disabled deprecated APIsSona Kurazyan2019-07-0812-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QImageIOHandler::name() has been deprecated since 5.13, but its overrides weren't. Enabled compilation of the overrides only when the QImageIOHandler::name() is compiled. Task-number: QTBUG-76491 Change-Id: I913f03f730969ea88864a5a08afe50c4eac533ca Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: I03fcc6c395a5eb007bc17c0a47d55e3941b48ffe
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-281-0/+28
| |\ \
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-271-0/+28
| |/| | | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I468a913d74687b6dae4b5f01873dc9fd77ac9866
| | * 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
| * | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+31
| |\ \
| | * | Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+31
| |/| | | | | | | | | | | | | | Change-Id: Ice21bedefc4172c1e3587033c9dae35e325e6e08
| | * | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.0Antti Kokko2019-05-081-0/+31
| | | | | | | | | | | | | | | | | | | | Change-Id: I7f65c3edcc9499e4992994454071f50f53c0f6ff Reviewed-by: Liang Qi <liang.qi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 17:49:58 +0000