summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * 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>
| * | | 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