summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Regenerate and fixup qtimageformats projectswip/cmakeAlexandru Croitor2020-03-1623-99/+256
| | | | | | | | | | | | | A few changes happened since last update: - CMake target names are now consistent with Qt 5 names - ZLIB handling - TIFF 3rd party handling - Standalone tests simplification - Updates in the SUBDIRS project - Other minor changes Change-Id: I85cca79d38feca44c5b78dae48c79779ae05e288 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-1670-954/+2897
|\ | | | | | | | | | | | | Conflicts: dependencies.yaml Change-Id: Ia9a6efda0bea5bc7c5f9f8cd4735da0bd3c0da26
| * Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-03-051-1/+1
| | | | | | | | | | Change-Id: Ic9e6e5c0b67b413874187527c52208d9f7893182 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Merge remote-tracking branch 'origin/5.15' into devSimon Hausmann2020-03-0516-83/+0
| |\ | | | | | | | | | Change-Id: I588e16b5c0d1bde354d98d7747450932948f2c4d
| | * Remove overrides of QImageIOHandler::name()v5.15.0-beta2Shawn Rutledge2020-03-0316-83/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since name() returns format() by default, these haven't been necessary for a long time. We will remove the base class function in Qt 6, so we should remove the overrides and other uses now to ensure that it will be OK. Followup to 7ad0ef0f31afd89509dc2cb3c102b22c0e6c725c. Change-Id: If3b83a36a36747f8e57775053166edd98512e684 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-03-051-1/+1
| | | | | | | | | | | | | | | Change-Id: If9fce33edd36c53033215250e0204d93409d19fe Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-03-031-1/+1
| | | | | | | | | | | | | | | Change-Id: I572f69401d9d75d7a44f1a6add4b2eea6870c2cc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-291-2/+2
| |\| | | | | | | | | | Change-Id: Ife67c05ce15001df225845630dd9152bab84026c
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-251-2/+2
| | |\ | | | | | | | | | | | | Change-Id: Ib2aaec7a6d8a1bf6f7201c55f0871c0aa27d02a4
| | | * tiff: do not try to read 32bpc as 16bpcEirik Aavitsland2020-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The header reader would assume that bits per sample above 8 had to be 16, but other values are also possible, so check explicitly. Fixes: QTBUG-82412 Change-Id: I7f0799de4d4cdc84023a34900aa595a7bf73eca1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I4172f499e0559d2829eec5d97d9f632988282994 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I4717f98124777d5432a6a3d187a31f1e2544fcf8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I6131ec2165881249a9353fa14379725ffc421bd8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ida9e67e57f5a3b61127bf6a0ffa052cabddbfdd3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: If66838a02d21d0adc583ee268f9d3329bfe62dd2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I87e0409c24a9b16e8a9036e024812c49746038cb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I17f3806a49f3ded68bee4ee5611d840abe96283b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib4496ae4db755fe5b51e2b0b04d0ec69496d28bd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I15bb9a27a64fe9f375a9806039d33b6f788e1577 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I267af21e058cb3047ed4bb80272fb7d579dd0eef Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ieabef531658b79e8fef1f4526f76cf540aa1d3d2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I551a5be99093ba7b7b642fec74239b2c28fefa8e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I9611e4a33f827c2908cce4fe300be34d30ac7ab0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I5586e5a523a739afe246bfbb681c521562ab7bad Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-181-1/+1
| |\| | | | | | | | | | | | | | Change-Id: I1f1ad47eeff286303de844d8cc06ed8d69c4b3b3
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1Qt Forward Merge Bot2020-02-151-1/+1
| | |\| | | | | | | | | | | | | Change-Id: I6bc111acb8e9a296404466f80f051a969bca5ddd
| | | * Fix NEON support on Android armeabi-v7a for webpAndré Klitzing2020-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sibling of caef33ae2df64eb397eadfc4ce4735545ff93ea5 Task-number: QTBUG-81461 Change-Id: I26bb7b65c9d25952d338f5684e145f91eb9695a8 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I3f072b5036479c012d83de9b4bdb84fdff506d11 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia80dfa5fea7eb56d8077893896381503e7a83507 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I0db6e482ffe9aebc52747a2d3a50447e541c8a7a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I938ab61d6d8f1057986a1cc37b702fbc2cc1d323 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: If5611c6554664e99171f9b9b7d47f51781d61b8e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I9fb7bdbc9d5f3b4dcc657cbd92e3cf3045920ce3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Iac1fa57946249719df38b88176037f131e31ff02 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I3e5226b4c42b19a8342b8fbd934e7dd6acdac4bb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-080-0/+0
| |\| | | | | | | | | | | | | | Change-Id: Icc969a18bc508e948ccb2abd3363e61eac772fdc
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I25aab73ceef95d11a23e4fb2ac1c6c4c84f7e134
| | | * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | | | | | | | | | Change-Id: I294164efd7167b6b0448365a1847ca67db97c378
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I3339716888709573f29c5abf66492fe4fc11857a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I2264ecb64ec699a6716fce621d9830b358ef20bf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependenciesMike Krus2020-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | So we can update qt3d in turn Change-Id: Ib8e69f6a53f86d8c3ec6bcd3e6186d19082aa1f1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Remove QT_NO_LINKED_LISTSona Kurazyan2020-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QLinkedList is deprecated and moved to Qt5Compat, there's no need for QT_NO_LINKED_LIST. Change-Id: Icd21113feaae298ec4897b3343bfa8315a0e681a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib8e02329b0aeb0debbfc110129f6238d2f89571a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I77b57580a016f5f0756596470558a381747feafc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ied714f2e0e930cf291d3637573cbbb4736de7cac Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtimageformatsQt Submodule Update Bot2020-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I78a20b152658fc670e25a2918ffc2846fd125949 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-011-0/+20
| |\| | | | | | | | | | | | | | Change-Id: I107ae795a96219bcd4acaf638a9f994160b6c7e6
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
| | |\| | | | | | | | | | | | | Change-Id: I5c6c4a0d467c5069e1a9efb41887d213e5baa4f3
| | | * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| | | |\ | | | | | | | | | | | | | | | Change-Id: I06d5ed9a742256dde05b8943d0b597b58ca6424b
| | | | * Add changes file for Qt 5.14.1v5.14.1Antti Kokko2020-01-151-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + b46081e233c18026c15504e07bb9c0c9f228906b Bump version + ad587da5460a2c8ca90422dc3d61f0e16ec6e7c2 Use pkg-config to find dependencies + 80249142d9407cb355c2a0bd5cbbdaa6800f8aba Disable the webp plugin for winrt on ARM + 90f384644991b72728202b0a3edf6b079ba6989a winrt: Disable libtiff for x86 configurations + 31338f220f1ad1d0b8c050c48b04e733c4b62e1b Do not explicitly disable plugins for winrt Change-Id: If05edcfd3a8f556c9988df4a31f7f62845d09d23 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 22:03:55 +0000