summaryrefslogtreecommitdiff
path: root/src/imageformats
Commit message (Collapse)AuthorAgeFilesLines
* Remove remains of qmake conversion from CMakeLists.txt filesFriedemann Kleint2023-02-081-4/+0
| | | | | | Pick-to: 6.5 Change-Id: Ic00df7d45246270d724b3b1d1ef9d13d76dcc136 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Fix Threads::Threads global target promotion issueAlexandru Croitor2023-01-311-0/+6
| | | | | | | Pick-to: 6.5 Fixes: QTBUG-110720 Change-Id: I064cab7afa662a53fe70938023aa7e994f1b7b84 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Change the license of all CMakeLists.txt and *.cmake files to BSDLucie Gérard2022-08-253-3/+3
| | | | | | Task-number: QTBUG-105718 Change-Id: I3598499ab89b0e88718eded846306511000e8db9 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Doc: Add the Apple OS-based heic and jp2 plugins to the format listEirik Aavitsland2022-08-181-0/+3
| | | | | | | | Those were added earlier, but the doc was not updated. Pick-to: 6.4 Change-Id: I89f762d4172bba77ff4e3d85b80eef3017315358 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Add license headers to cmake filesLucie Gérard2022-07-073-0/+9
| | | | | | | | | | | | CMakeLists.txt and .cmake files of significant size (more than 2 lines according to our check in tst_license.pl) now have the copyright and license header. Existing copyright statements remain intact Task-number: QTBUG-88621 Change-Id: Ifbf0be4c6f03259f9d084bbef4cf44fa60bf3fde Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Remove "Changes in Qt 6" stubKai Köhne2022-06-292-25/+0
| | | | | | | | | The page was just a stub; apparently nothing worthwhile to report changed in Qt ImageFormats for Qt 6. Pick-to: 6.2 6.3 6.4 Change-Id: Ic99ea35005a2fb0d111e345c1e7eac1baf659bea Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Use SPDX license identifiersLucie Gérard2022-06-132-52/+4
| | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I775d4a0c07b2b82a097d36649203e7f6223fdc51 Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Remove old configure-related filesJoerg Bornemann2021-06-171-183/+0
| | | | | | | | | | | | | Remove the configure.json and configure.pri files that were used for the qmake-based configure. Remove the .prev_*.cmake files that were a by-product of configurejson2cmake.py. Pick-to: 6.2 Task-number: QTBUG-89536 Change-Id: I3a760b05d7e37e34779b0fb721425ceb0998cbfd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix mng image plugin in cmake buildNiclas Rosenvik2021-02-241-1/+2
| | | | | | | | | | | | | Add cmake/FindLibmng.cmake based on qtbase/cmake/FindLibb2.cmake . Enable mng if found and link to the imported target provided by FindLibmng.cmake so that mng can be used. Libmng 1 did not come with a pkgconfig file and it is still in use so FindLibmng will use the normal cmake procedures if pkgconfig fails to find libmng. Pick-to: 6.1 Change-Id: Iecf4ede700b1bfdab84c98c7333547f0bcecc6b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Remove QMake project filesJoerg Bornemann2021-02-112-5/+0
| | | | | | | | | | This includes removal of the corresponding .prev_CMakeLists.txt files. Pick-to: 6.1 Task-number: QTBUG-88742 Change-Id: I43bd344cd515aa2f671d012c64f281e8fc4793c9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* CMake: Re-generate configure and project filesJoerg Bornemann2020-12-102-2/+6
| | | | | | Pick-to: 6.0 Change-Id: Ifc9d3ee1d856c750556962b0fac8d054fcfee970 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Build docs for imageformats repoAlexandru Croitor2020-11-102-0/+9
| | | | | | | | | | | pro2cmake only generates qt_internal_add_docs() calls for module targets. qtimageformats doesn't have any modules, but still needs documentation. Create a custom interface library target and provide it as the argument for the qt_internal_add_docs() call. Change-Id: I1cf4942f291cff90b7765534a8db7630c2c9cd78 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Rename "Porting" pages to "Changes"Jerome Pasion2020-11-092-3/+3
| | | | | | | | | | | | | | The content in the porting guides are closer to a changelog than a porting guide. At this point, it is easier for maintainers and contributors to write in a changelog than a guide. This change should help with readability and is closer to the usage of "Changes" in documentation. Part of a rename in other submodules. Task-number: QTBUG-87156 Change-Id: Ibc0ef3d39c2d5defb0ef8b1e7f1e9f83cac83a52 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: Add Qt 6 changes filePaul Wicking2020-09-242-3/+52
| | | | | | | | | Also, adjust section levels and add "." to the brief to silence a QDoc warning. Task-number: QTBUG-84051 Change-Id: I3adca1d56d931dbf4181c96ac150e6ccd79ea388 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* CMake: Regenerate configure.cmake filesAlexandru Croitor2020-06-041-5/+13
| | | | | | | This will show the usual configure summary reports. Change-Id: I01d5cde762d47e7b7abbeda6fc331dde5cf9234b Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Remove winrtOliver Wolff2020-06-031-1/+1
| | | | | | Task-number: QTBUG-84434 Change-Id: I4ece23ce592b878197151a801d183891f3f6539f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-041-1/+1
|\ | | | | | | Change-Id: I5afd4c2812825b822b4a855f4f0ef23b5d8562af
| * winrt: Enable webp for winrt arm configurationsv5.15.0-beta4v5.15.0-beta3Oliver Wolff2020-03-281-1/+1
| | | | | | | | | | | | | | | | | | The fix from upstream has landed in Qt so that webp can now be enabled for that configuration as well. Task-number: QTBUG-71251 Change-Id: I772decad30c91c6e028af05bdba0601ebd1574df Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-161-6/+10
|\ \ | |/ | | | | | | | | | | Conflicts: dependencies.yaml Change-Id: Ia9a6efda0bea5bc7c5f9f8cd4735da0bd3c0da26
| * winrt: Disable libtiff for x86 configurationsOliver Wolff2019-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | For some reason the build of libtiff fails during linking for x86 configurations (unresolved symbols GetFileSize & CreateFile) while it works as expected for x64 and arm. Disable that configuration, but keep support for working scenarios. Task-number: QTBUG-71251 Change-Id: I181a42378584af8c2fffccbb3ddd252e4a057dfb Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Disable the webp plugin for winrt on ARMOliver Wolff2019-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | There is a bug in libwebp which prevents building the plugin for an ARM winrt configuration. Until the bug is fixed upstream, the feature should not be available for these configurations. Task-number: QTBUG-71251 Change-Id: I10313d4fe63dc25cefed3153d9acf1f3b12c05a4 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Use pkg-config to find dependenciesMarius Kittler2019-12-171-4/+8
| | | | | | | | | | Change-Id: Ifa826410494f65a560fe8dea999d4665f2f1191b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-151-97/+65
|\ \ | |/ | | | | Change-Id: Ib8c81669bd2f83c829fab625623452e4891b2356
| * 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>
| * Support writing WebP color space profilesAllan Sandfeld Jensen2019-08-211-3/+4
| | | | | | | | | | Change-Id: I9d9473c2866d9792cd8752816a291be04e39ec19 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-08-151-0/+1
|\ \ | |/ | | | | Change-Id: Idf48bddde98d108d3692eddb8971affcc691a614
| * 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>
* | Regenerate qtimageformatsAlexandru Croitor2019-06-061-0/+2
| | | | | | | | | | | | | | Ends up adding plugin class names and types. Change-Id: I3824a3a00cf6f56442a0494effcf641e22b3dcc7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Fix qtimageformats buildingAlexandru Croitor2019-06-061-2/+2
| | | | | | | | | | | | | | | | | | Some feature conditions were incorrect. Added forgotten FindWrapWebP.cmake file. Protect call to qt_find_package ZLIB. Change-Id: I033d38e4f69e94f7b72346b49bf6de4b2dbde8e0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Initial CMake PortAlexandru Croitor2019-05-281-0/+60
|/ | | | | | | | | Port 90% of imageformats to be built with CMake. Missing support for mng plugin and documentation. Change-Id: I1d7e4b93c6f8446468f00dbf0663a6a4ec8c9774 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* 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>
* Remove the QT_NO_IMAGEFORMAT_{TIFF|WEBP} definesJoerg Bornemann2019-04-021-4/+2
| | | | | | | They are #undef'ed anyway. Change-Id: Ic1cb3c09b5849f16115d8514fef471825d564f2c Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Move qtimageformats over to the new config systemLiang Qi2019-04-021-0/+212
| | | | | | | Task-number: QTBUG-44318 Task-number: QTBUG-62259 Change-Id: Ide5c28015c46b12ee3f21d06badd69db8bed1281 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Remove bundled, unmaintained libjasper source codev5.12.0-beta3Eirik Aavitsland2018-10-151-1/+1
| | | | | | | | | [ChangeLog][Third-Party Code] The unmaintained bundled libjasper has been removed. Building the jp2 handler will require libjasper to be present as a system or external library. Change-Id: Ic48cc6021fc5fb64fb369eb9621fd7a811e8e9f7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove bundled, unmaintained libmng source codev5.12.0-beta2Eirik Aavitsland2018-10-121-1/+1
| | | | | | | | | [ChangeLog][Third-Party Code] The unmaintained bundled libmng has been removed. Building the mng handler will require libmng to be present as a system or external library. Change-Id: I4a4805fa3f3088b5d581b92bfeabba7978bac5f7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* 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>
* Fix outdated FDL license headerKai Koehne2017-10-171-5/+5
| | | | | Change-Id: I1e024810b9c5a9fc32986507d263f8b9727f2315 Reviewed-by: Jani Heikkinen <jani.heikkinen@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>
* 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>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-261-3/+7
|\ | | | | | | Change-Id: I6c1caae4b071cac4caf88bf85582a2a76a1ccd2b
| * Doc: Clarify status of MNG, Jpeg2000 pluginsv5.6.25.6.2Topi Reinio2016-08-021-3/+7
| | | | | | | | | | | | | | | | | | | | | | While the repository still contains bundled copies of 3rd party codecs for these formats, they are not part of the build process anymore; the corresponding plugins are built only when the system libraries are found. Change-Id: Ib658b921bd08b63e68886922fc6bc45c5c3cc637 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Add documentation for 3rdparty codeKai Koehne2016-09-191-0/+13
|/ | | | | | | | Use new licensescanner / qt_attribution.json file infrastructure to generate documentation about 3rdparty licenses. Change-Id: Ic81d8c33be094e51b6e4ca0f35074136170f491b Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Doc: Fix few misses from last copyright headers update.Julien Brianceau2015-08-274-756/+0
| | | | | | | | | | The documentation template with outdated copyright information is removed, it's not used anymore. Change-Id: Idc93bee04339739807c15f37c5bbbee1bbdd34c4 Reviewed-by: Julien Brianceau <jbriance@cisco.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Update copyright headersJani Heikkinen2015-02-111-6/+6
| | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I6aafb5f38bfaf68a9f4eaca69a56006db5cd8843 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* Doc: Removing url variable from qdocconf file.Jerome Pasion2014-07-071-1/+0
| | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I9d7f513b1e47c5ebd3d0bd0bf0f7647c175d096e Reviewed-by: Martin Smith <martin.smith@digia.com>
* Remove unused and unlinked qdocconf file from the project.v5.3.0-rc1v5.3.0-beta1v5.3.0release5.3.0Jędrzej Nowacki2014-03-181-21/+0
| | | | | Change-Id: I2d0b60c47d92ba82e04a0d90877bda6b287f5a85 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Added webp information in doc and changelogv5.3.0-alpha1Liang Qi2014-02-211-0/+1
| | | | | | | Change-Id: I1287608e914598c58acff70a47f71cc0bf36f094 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add JPEG 2000 plugin.Jake Petroules2014-02-112-1/+2
| | | | | | | | It is moving from Qt Solutions. Change-Id: Ie0dc44d258597f871544fa43238528f42628b799 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Add ICNS (Apple Icon Image) plugin.Alex2013-12-171-0/+1
| | | | | | | | | Change-Id: I98f79d781e5986ee5602438e02d761c7f5a77217 Reviewed-by: Ivan Komissarov <ABBAPOH@me.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>