summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| | * Add changes file for Qt 5.6.3Antti Kokko2017-08-311-0/+26
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62717 Change-Id: If125eec9f76187afcc6722f7b0825745ffe31303 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Add native Darwin handler for the HEIF (.heic) formatEirik Aavitsland2017-10-3015-7/+423
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds basic support for still images encoded with the HEIF standard introduced in macOS Sierra and IOS 11. Uses the Core Graphics Image I/O Framework as codec backend. Reuses the helper class from the macjp2 handler. Change-Id: I5f0c7891b189a916cccd2c27eacbac12416ce209 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | | Check for not clang when checking for MSVCAllan Sandfeld Jensen2017-09-291-1/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-63512 Change-Id: I9cd97dc178c108dfca0b1ee12dd18b78497603d7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-221-4/+4
| | | | | | | | | | | | | | | Change-Id: Iba9c9b77bea8c4ec6915a0cac6aa9c84aaa77dca Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Bump versionFrederik Gladhorn2017-09-041-1/+1
|/ / | | | | | | Change-Id: I1a258d8ae98904c417463587795a14ad0126cae4
* | Fix deprecation warningsv5.10.0-beta3v5.10.0-beta2v5.10.0-beta1v5.10.0-alpha1Allan Sandfeld Jensen2017-08-071-1/+1
| | | | | | | | | | | | | | Use new sizeInBytes() method. Change-Id: I3fa5969ac04e2edb87a06f132dc0b60e65718b81 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-07-044-0/+37
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I55c144a1d0579aa19691c44c4f8ef8bf702189cb
| * WebP: respect the frame dispose method for animationsJ-P Nurmi2017-07-031-0/+4
| | | | | | | | | | | | Task-number: QTBUG-61640 Change-Id: I9d0bfbafe15df338355cf2f5c77c2d4f8f00d27f Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Fix QWebpHandler::canRead() to take animation frame count into accountJ-P Nurmi2017-07-032-0/+5
| | | | | | | | | | | | Task-number: QTBUG-61641 Change-Id: I24a139cc75141a588f2ed2558da85cd2f8391af9 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | Change-Id: Iec877a63b3cc750f1d5df5076e074f12676f4360
| * Add changes file for 5.9.1v5.9.1Antti Kokko2017-06-191-0/+24
| | | | | | | | | | Change-Id: I6ffbcf2ff74e946bac05534a250029503e55e2b3 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Doc: Add a note about the DDS handler not being built by defaultLeena Miettinen2017-06-121-0/+4
| | | | | | | | | | | | | | | | | | ...for security reasons. Task-number: QTBUG-59955 Change-Id: I74e25d7c46490e476186b486b8c1845e425964f9 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | qtiffhandler: correct types for height and widthJerome Duval2017-06-141-2/+2
| | | | | | | | | | | | | | | | qMin() was used with quint32 and uint32. This fixes the build on Haiku. Change-Id: I193f561b9a63ffe9ee5ae991084118a821e3f22d Reviewed-by: Augustin Cavalier <waddlesplash@gmail.com> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-074-4/+30
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0d75cdb889e1ea18837037e08be531a99a8ce5eb
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-311-0/+27
| |\ | | | | | | | | | Change-Id: I9abdad989d0ef0c854c7638886c4246f31c4b9dc
| | * ChangeLog: Move libwepb update into Third-Party Code areav5.9.0-rc2v5.9.0-rc1v5.9.0Kai Koehne2017-05-151-5/+5
| | | | | | | | | | | | | | | Change-Id: Ia15ef6b1015757bac0e8155247379251922aff61 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Add changes file for 5.9.0v5.9.0-beta4Eirik Aavitsland2017-05-061-0/+27
| | | | | | | | | | | | | | | Change-Id: I9ed5494a8b6b137e4b48f8a788ff89bd3c7a09ac Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Bump versionOswald Buddenhagen2017-05-101-1/+1
| | | | | | | | | | | | Change-Id: I335232e10b3ad2575fcd16c583a2453830e63488
| * | Remove DDS from image format docsAlan Alpert2017-05-041-1/+0
| |/ | | | | | | | | | | | | | | | | The plugin has been removed from the build (since 5.8) and is now unmaintained. While keeping the code around for adventurous users makes sense, people who rely on reading the docs should now assume it is gone. Change-Id: I9df73d899e49cc94fb9316effa80778adbda5e6d Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| * Support for Q_OS_ANDROID_EMBEDDED and android-embedded buildsOtto Ryynänen2017-04-252-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | The Embedded Android build (Boot to Qt Android injection) is defined by having both Q_OS_ANDROID and Q_OS_ANDROID_EMBEDDED flags defined, as well as having Qt config android-embedded. Those flags are set in mkspecs when building for embedded Android. This commit enables the possibility to build embedded Android builds. (i.e. Qt build for Android baselayer only, without JNI) Change-Id: I8d139b6d7b61c00ad44079cbfa6e5c77e8618a7b Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>