summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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.45.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.05.10.0Liang Qi2017-11-211-0/+24
| |\ \ \ |/ / / / | | | _ | | | Change-Id: I1993557dbed590871ef322e7315e46d00265abab
| * | Add changes file for Qt 5.9.3v5.9.35.9.3Antti Kokko2017-11-081-0/+24
| |/ | | | | | | | | Change-Id: I0700ad34e75240f637e6d17586e65831f58c12d8 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | 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.25.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>
* | 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.15.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.05.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>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-21211-8897/+19899
|\ \ | |/ | | | | Change-Id: I182b9e5f4a9283c289bbe816868f000ad07b15f4
| * Extend support for tiled tiff files to all color formatsv5.9.0-beta3v5.9.0-beta2v5.9.0-beta1Eirik Aavitsland2017-03-1614-99/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit extends the recently added support for tiled tiff images of color index format to also cover grayscale and mono images. RGB images were already covered, since the libtiff API used for those handles tiled images transparently. This commit also simplifies the tiff read() function by sharing common code among the different formats. [ChangeLog][TIFF] Extend support for tiled tiff files to all color formats Change-Id: I13f94bbca65dd6a35384a415906034e245ad8b79 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Add support for tiled, color indexed tiff filesEirik Aavitsland2017-03-155-2/+53
| | | | | | | | | | | | | | | | | | | | | | | | For color index images, the tiff handler uses scanline based reading. The tiff decoder does not support that if the image is stored in tiled format. This commit adds tile based reading for such cases. [ChangeLog][TIFF] Added support for tiled, color indexed tiff files Task-number: QTBUG-12636 Change-Id: Ic759903c75c8252267429f01e3dd9706fc516f8f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Build fix for -no-feature-regularexpressionPaul Olav Tvete2017-03-151-1/+3
| | | | | | | | | | Change-Id: I69942195d5208985d75333a13ed0ac5ae8f595d2 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Bundled libwebp updated to version 0.6.0Liang Qi2017-03-13146-6482/+14025
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit imports libwebp 0.6.0, including AUTHORS, COPYING, ChangeLog, NEWS, PATENTS, README and src directories. In src, only includes header and source files. Upstream changes since 0.5.1 have been merged in. Also updated version in qt_attribution.json. Conflicts: src/3rdparty/libwebp.pri src/3rdparty/libwebp/qt_attribution.json src/3rdparty/libwebp/src/webp/config.h Change-Id: I001aa7a3fabf0130b54f9005c23aa822bc1d0ec1 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-06117-2293/+5698
| |\ | | | | | | | | | Change-Id: I9cf7f04769944935d7b836453c7982839857a909
| | * Fix include order5.8Ulf Hermann2017-03-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | We need to include qimageiohandler.h if we want to be sure that we can use it. Also, QT_NO_IMAGEFORMATPLUGIN is defined in a header and needs to be checked after the includes. Change-Id: Ic6c376c87abb9684f45ca3d740deb7e580220ae4 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | * Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-26116-2291/+5696
| | |\ | | | | | | | | | | | | Change-Id: I8a8151eb2dd01059cf86da8f72ecb65612bff0c1
| | | * Bundled libtiff updated to version 4.0.7v5.8.0-rc1v5.8.05.8.0Liang Qi2016-12-1343-567/+1503
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit imports libtiff 4.0.7, including COPYRIGHT, ChangeLog, README, README.vms, RELEASE-DATE, TODO, VERSION and libtiff, port directories. In libtiff, only includes SConstruct, libtiff.def, libtiff.map, libtiffxx.map, tif_config.h-vms, header and source files. In port, only includes header and source files. Upstream changes since 4.0.6 have been merged in, includes 701ba023 and 52dd6b1e. Also updated version in qt_attribution.json. Conflicts: src/3rdparty/libtiff/libtiff/tif_win32.c src/3rdparty/libtiff/libtiff/tiffiop.h src/3rdparty/libtiff/port/strtoull.c src/3rdparty/libtiff/qt_attribution.json Change-Id: I7a7a55676c007fd2b3eeff2b2e3ca481eb5724d9 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | | * Bundled libwebp updated to version 0.5.1Liang Qi2016-12-1372-1724/+4165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit imports libwebp 0.5.1, including AUTHORS, COPYING, ChangeLog, NEWS, PATENTS, README and src directories. In src, only includes header and source files. Upstream changes since 0.5.0 have been merged in. Also updated version in qt_attribution.json. Conflicts: src/3rdparty/libwebp.pri src/3rdparty/libwebp/qt_attribution.json src/3rdparty/libwebp/src/webp/config.h Change-Id: I7d0c15400154c3b4ee8ff37665303307c4b84f9f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| | | * Add changes file for 5.8.0Eirik Aavitsland2016-12-131-0/+28
| | | | | | | | | | | | | | | | | | | | Change-Id: Iad8edc1ce474907a017d2751650a447280e68aaa Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* | | | Bump versionOswald Buddenhagen2017-02-021-1/+1
|/ / / | | | | | | | | | Change-Id: I7097482b3672c0faccc511210a94df6a5c9be590
* | | Add support for multipage TIFF images to QTiffHandlerv5.9.0-alpha1Sandro Mani2017-01-255-10/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows multipage TIFF images to be read via QImageReader::jumpToImage and QImageReader::jumpNextToImage. [ChangeLog][QtGui][QImageReader] Support multipage TIFF images through QImageReader Change-Id: Id6ac68b75500148e51be11eff3d296c929d2d95c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-252-7/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I519c785ed64bdb0669d884a11d45be6532e629ec
View Lorry Controller Status