summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-155-120/+168
|\
| * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-011-3/+8
| |\
| | * Fix JasPer version checkv5.14.0-beta1v5.14.0-alpha1Joerg Bornemann2019-09-191-3/+8
| * | Merge "Merge remote-tracking branch 'origin/wip/qt6' into dev"Simon Hausmann2019-09-192-4/+2
| |\ \ | | |/ | |/|
| | * Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-09-182-4/+2
| | |\
| | | * Merge remote-tracking branch 'origin/dev' into wip/qt6Simon Hausmann2019-09-165-26/+109
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.14' into devQt Forward Merge Bot2019-08-291-11/+14
| | | | |\
| * | | | | Fix and re-work compile testsJoerg Bornemann2019-09-181-97/+59
| |/ / / /
| * | | | Fix build after QColorSpace API changesTor Arne Vestbø2019-09-051-2/+0
| * | | | Merge dev into 5.14 (delayed final downmerge)Kari Oikarinen2019-09-042-14/+55
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | * | Support writing WebP color space profilesAllan Sandfeld Jensen2019-08-212-14/+55
| * | | Fix Android multi ABIs compilationBogDan Vatra2019-08-281-11/+14
| |/ /
| * | Read color space from WebPAllan Sandfeld Jensen2019-08-192-0/+18
| * | Read/write ICC profile in TIFF pluginAllan Sandfeld Jensen2019-08-171-1/+18
| * | Do not try to write too large WebP imagesAllan Sandfeld Jensen2019-08-171-0/+4
* | | Regenerate projects before mergeAlexandru Croitor2019-10-1518-44/+32
* | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-08-1565-480/+596
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'origin/dev' into wip/qt6Alexandru Croitor2019-08-1160-348/+563
| |\|
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-031-3/+3
| | |\
| | | * Reapply: Fix building with clang_clAllan Sandfeld Jensen2019-07-311-3/+3
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-2346-346/+532
| | |\|
| | | * Update bundled libwebp to version 1.0.3André Klitzing2019-07-2246-346/+532
| | * | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| | * | Fix compilation with disabled deprecated APIsSona Kurazyan2019-07-0812-0/+24
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-142-5/+9
| | |\|
| | | * Fix feature and library checks for tiff and mngJoerg Bornemann2019-05-132-5/+9
* | | | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-06-172-4/+2
|\| | |
| * | | Fix qt6 buildAlexandru Croitor2019-06-142-4/+2
| |/ /
* | | Regenerate qtimageformatsAlexandru Croitor2019-06-0618-0/+57
* | | Fix qtimageformats buildingAlexandru Croitor2019-06-062-3/+12
* | | Initial CMake PortAlexandru Croitor2019-05-2820-0/+573
|/ /
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3Qt Forward Merge Bot2019-04-161-0/+1
|\|
| * Fix -no-gui buildJoerg Bornemann2019-04-121-0/+1
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2Qt Forward Merge Bot2019-04-093-10/+2
|\|
| * Remove the QT_NO_IMAGEFORMAT_{TIFF|WEBP} definesJoerg Bornemann2019-04-023-10/+2
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-026-14/+236
|\|
| * Move qtimageformats over to the new config systemLiang Qi2019-04-025-11/+233
| * Fix building with clang_clAllan Sandfeld Jensen2019-04-011-3/+3
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-275-49/+208
|\|
| * Heic handler: fix orientation and other image propertiesEirik Aavitsland2019-03-264-48/+207
| * tiff handler: fix compilation failureEirik Aavitsland2019-03-251-1/+1
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-02-0921-165/+530
|\|
| * Update bundled libwebp to version 1.0.2André Klitzing2019-02-0421-165/+530
* | Add Grayscale16 support to TIFFAllan Sandfeld Jensen2019-01-031-2/+8
|/
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-11135-864/+1687
|\
| * Update bundled libtiff to version 4.0.10Eirik Aavitsland2018-11-1967-469/+987
| * Update bundled libwebp to version 1.0.1André Klitzing2018-11-1968-395/+700
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-271-5/+14
|\|
| * tiffhandler: improve stripsizeEirik Aavitsland2018-10-251-5/+14
* | Remove bundled, unmaintained libjasper source codev5.12.0-beta3Eirik Aavitsland2018-10-15121-42492/+7