summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix build issue with QT_USE_QTSTRINGBUILDERv5.6.1-1v5.6.1Frank Meerkoetter2016-05-101-1/+1
| | | | | | Change-Id: Ib10e37f32e3b83c767a6b0ef2d0ae527e2435f49 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-258-32/+32
| | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I1970c3588d4ef3140adb655c01291e585b4f25b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-02-151-1/+4
|\ | | | | | | Change-Id: I0314084af3028bd840b1b46f35134c464de51841
| * Merge 5.6 into 5.6.0v5.6.0-rc1v5.6.0Oswald Buddenhagen2016-02-021-1/+1
| |\ | | | | | | | | | Change-Id: I19a0c02f6cb3731d4b99d158106b6a1a29862dbb
| * \ Merge remote-tracking branch 'origin/5.5' into 5.6.0Liang Qi2016-01-301-1/+4
| |\ \ | | | | | | | | | | | | Change-Id: Iaa0f274e35fd48dc6767a458fd0ee24c8b48e87a
| | * | Support custom ZLIB library name(s)5.5Mike Gelfand2016-01-301-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is already the case for qtbase and qtwebkit, while here only hard-coded "zdll.lib" was used on Windows. Change-Id: I6592ed8cfc667db58cb7ab65f97f00fc83e8e7d5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | | Improve interpretation of undefined alpha-channelsAllan Sandfeld Jensen2016-02-112-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Libtiff does not process the alpha-channel if its definition is not specified. However to match how Qt used to save TIFF images and how tested image viewers interpret them, we need to treat unspecified alpha channels as unpremultiplied. Task-number: QTBUG-50902 Change-Id: Id72218ed5bf702b54ffa3b5b47d6230facbfa0c4 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* | | | Bump versionOswald Buddenhagen2016-02-081-1/+1
| |_|/ |/| | | | | | | | Change-Id: I47f7968322cf8a73ec1cb8ad0d533fe2417fbb16
* | | Android: fix QT_CPU_FEATURES checkBogDan Vatra2016-01-251-1/+1
|/ / | | | | | | | | | | | | Task-number: QTBUG-50394 Change-Id: If57e650423fcd715b8143e59958dc756f7aea023 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Add changes file for 5.6Eirik Aavitsland2016-01-141-0/+41
| | | | | | | | | | Change-Id: I938c275371b4287f9da9148732505beaadbae90d Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Bundled libtiff updated to version 4.0.6v5.6.0-beta1Eirik Aavitsland2015-12-0939-1012/+2594
| | | | | | | | | | | | | | | | Upstream changes since 4.0.3 have been merged in. Our local tif_conf.h have been updated according to the upstream changes in tif_conf.h.in. Change-Id: I1c2aef6f0f60377de4876e25df723c32a6f95ea6 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | libwebp: update patches to 0.4.4 for Qt usageLiang Qi2015-12-081-4/+4
| | | | | | | | | | | | Change-Id: I995c765a0bd200f87c686a58778e94ec5e755809 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* | libwebp: update to 0.4.4Liang Qi2015-12-0820-485/+760
| | | | | | | | | | | | | | | | | | | | | | | | | | This commit imports libwebp 0.4.4, including AUTHORS, COPYING, ChangeLog, NEWS, PATENTS, README and src directories. In src, only includes header and source files. The patches required to build it in Qt will follow in separate commit(s). Change-Id: Ib12593f56553e5358548c224d1855273f3fd2318 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* | Build MNG and Jpeg2000 plugins only if system libs foundEirik Aavitsland2015-11-253-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream development libmng and libjasper is mostly stalled, so security issues are dealt with by the linux distributions instead. Hence, the stale bundled copy of the 3rd party source code of those libraries can not be generally recommended. Leave the bundled versions in the repo for now as a transitional measure, so that the bundled-lib plugins still can be built manually (by doing qmake & make in the relevant src/plugins/imageformats subdirectory). In a later Qt version, the bundled copies of those libs should be removed. Change-Id: I651417d91ef0f43cb6abe638f97968576a78e2f0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Skip (pass) each autotest if the corresponding handler not presentEirik Aavitsland2015-11-259-3/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a check at initialization of each autotest, skipping it if the relevant plugin is not installed. This is the same as in the qtimagereader autotest in qtbase (SKIP_IF_UNSUPPORTED macro). Reason for change: Not all format handlers are supported on all platforms. Hence, the suite of autotests ("make check") should not fail on account of a missing plugin. Change-Id: Ic0f4da68a9527831f017db0f326afe6e631efd9e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | make use of the new QtZlib moduleOswald Buddenhagen2015-11-181-5/+1
| | | | | | | | | | Change-Id: I5c8e220d21bf2110f8382187c55c42379f1e7873 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-281-0/+2
|\| | | | | | | Change-Id: Ie19ac1c5d61d14938ea9457cb9d5944931e046d2
| * DDS: Bail out on failure to detect the format.Friedemann Kleint2015-10-201-0/+2
| | | | | | | | | | | | Task-number: QTBUG-48851 Change-Id: Iaf2c2b36539412a341edb721a135f36a97be4b83 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-021-0/+16
|\| | | | | | | Change-Id: Iab58d8196ae737c506125f37117c44e90dc1fb7a
| * Fix null pointer use within Jpeg2000JasperReaderv5.5.1Neil Williams2015-09-091-0/+16
| | | | | | | | | | | | | | | | | | jas_image_create will return null if the image create fails, so the return value must be checked. Task-number: QTBUG-47998 Change-Id: I4cb8a44742ca30d1f0b335b2db2c7f283c968c78 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into 5.6v5.6.0-alpha1Liang Qi2015-08-282-0/+688
|\| | | | | | | Change-Id: Id599e08b463989329ab369586bc01582eb64e445
| * Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-08-190-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I539e7abf49a6b14c31bf1c8ca440afcdbfb5164e
| | * Bump version5.4Oswald Buddenhagen2015-04-201-1/+1
| | | | | | | | | | | | Change-Id: Id5669f0ab9cb3c27e57d9fc39fa1bd62d793b6db
| * | Add the GPLv3 license textThiago Macieira2015-08-132-0/+688
| | | | | | | | | | | | | | | | | | | | | LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Doc: Fix few misses from last copyright headers update.Julien Brianceau2015-08-275-757/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-08-091-1/+1
|\| | | | | | | | | | | Change-Id: Ief86005c1309fdd08f32513782ee75f7e9751bc1
| * | Re-enable WebP support on iOSMike Krus2015-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Previous work for Android appears to have fixed iOS related issues. Works fine for loading textures in Qt3d Change-Id: I54dbc0b57035e2777bac9e05842a64d4283efbd8 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | | Prospective fix for build on iOSSimon Hausmann2015-07-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to commit 954fa54a88cff31a7fc869a49d17474ab1da8459 we also need to include the header that provides the jas_eprintf function declaration. Change-Id: I5f1e2e44bccf960ac88a21847e796e4548fcc4be Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-291-0/+28
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic2de78608a0a236c8125eff7d6950089f1ca559b
| * | Bump versionOswald Buddenhagen2015-06-291-1/+1
| | | | | | | | | | | | Change-Id: I1a0d7f96adb698c0012c1b41771e8bf16b1ddec9
| * | Add changes file for 5.5.0 releasev5.5.0-rc1v5.5.0Eirik Aavitsland2015-06-031-0/+28
| | | | | | | | | | | | | | | Change-Id: I56eb43d6fe834d5fba90e78267290fd73290fd5b Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-03249-35491/+14056
|\| | | | | | | | | | | Change-Id: Id8a59a58c7e5ca2f977c1e7408ff05033a9cc16b
| * | Handle Grayscale8 TIFFsAllan Sandfeld Jensen2015-05-292-18/+45
| | | | | | | | | | | | | | | | | | | | | | | | Correctly read and write Grayscale8 image format. Change-Id: I537c68f94077458c69ee1de08b5b37986b54aa26 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * | Android: Build webp pluginEskil Abrahamsen Blomfeldt2015-05-202-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to include the cpufeatures module in the build for Android, and we need to make sure the neon files are compiled with neon flags turned on. Since these are .c files, we cannot use the regular simd.prf approach, which only supports .cpp, so the compiler is basically copy-pasted from simd.prf, but using QMAKE_CC instead of QMAKE_CXX. [ChangeLog][Android] Added support for webp image format. Change-Id: Id702b8202bee963d23beb02a7dc163756c8ca712 Task-number: QTBUG-38715 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
| * | Optional application of orientation for TIFFAllan Sandfeld Jensen2015-05-192-116/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the image orientation only optionally applied for TIFF images to match the new image handler flags. The default however remains to apply transformation, as opposed to JPEGs. The patch also adds the capability to write metadata orientation. Change-Id: Ie24664516138641342ab6d7559d591f38b9f1e8a Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * | Correctly interpret RGBA tiff images as premultipliedAllan Sandfeld Jensen2015-05-122-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TIFFReadRGBAImageOriented method turns out to return colors with alpha premultiplied by default. The only reason we pass our own tests is because we also save the colors incorrectly unpremultiplied. The patch fixes the format type of the returned images, and explictily writes the how alpha should be interpreted in the saved files. Change-Id: Ie1c3881acfe07eae25ca735adf243c1636f656a0 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
| * | Clean up reading TIFF headersAllan Sandfeld Jensen2015-05-043-88/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split reading TIFF headers from the decoding to make it possible to read correct metadata on undecoded images. This fixes reading the image format from the QImageReader, and is necessary for later patches. Change-Id: Ida27e98252bf95459d87354586d4a5fba348efcb Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
| * | Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1Liang Qi2015-04-152-19/+8
| |\| | | | | | | | | | Change-Id: Ib6f1512a15f2714a712ff82df55a9d3de8e46ffd
| | * DDS: fix image format checkv5.4.2Maks Naumov2015-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Replace duplicated bBitMask check by the intended gBitMask check. Change-Id: I6d1780a4112e88484de661f07a15f2121602b86c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| | * Replace malloc'ed tables with QVarLengthArrayAllan Sandfeld Jensen2015-03-171-17/+6
| | | | | | | | | | | | | | | | | | | | | Basic cleanup using proper Qt classes instead of malloc. Change-Id: I532b47aac7cfe15a5963371224288bec08135f25 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Correct mask of A2B10G10R10Allan Sandfeld Jensen2015-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Green mask is missing an F. Change-Id: I7387ef01ee414abc1a48efec71d71f46922c1bed Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * | Remove more extraneous files from bundled libtiffEirik Aavitsland2015-04-09142-29895/+0
| | | | | | | | | | | | | | | | | | | | | They are HOWTO-RELEASE, SConstruct, nmake.opt and html sub directory. Change-Id: If7d3aad3a353caa14239b1faf0af8b9cd393bcf7 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | libwebp: update patches to 0.4.3 for Qt usageLiang Qi2015-04-092-13/+61
| | | | | | | | | | | | | | | | | | Change-Id: I1b333671e778824cc29b9c2125121fc7f1889b4d Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
| * | libwebp: update to 0.4.3Liang Qi2015-04-0999-5344/+13662
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit imports libwebp 0.4.3, including AUTHORS, COPYING, ChangeLog, NEWS, PATENTS, README and src directories. In src, only includes header and source files. The patches required to build it in Qt will follow in separate commit(s). Change-Id: I23ebfd69e47a468c91a9e9b109e9cb8ac63705d4 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
| * | Fix MSVC warning C4005: 'JAS_WIN_MSVC_BUILD' : macro redefinitionDebao Zhang2015-03-301-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | This macro has been defined in the jasper.pri file: msvc: DEFINES += JAS_WIN_MSVC_BUILD Change-Id: I3ac06e4f373c59ded4e3c2ebfa6f50e40a3c83ae Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* | | Fixed calculation of normal maps in DDSIvan Komissarov2015-04-281-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fix changes range of values for Z coordinate to 0..255 instead of 127.5..255 for ATI2 textures Change-Id: I53e7243c913483043599442ce13e42b07ee22ce6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | | Merge remote-tracking branch 'origin/5.5' into devFrederik Gladhorn2015-03-031-13/+13
|\| | | | | | | | | | | Change-Id: I8290a104654f86140ec32f4f51b474344b91a100
| * | Fix compiler warnings.v5.5.0-alpha1Christian Kandeler2015-02-251-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | The jas_image_coord_t is typedef'ed to int_fast32_t, which can be long. Change-Id: I78ed4731d9adf3ea9bd63092edd3f96a185d9c79 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* | | Bump versionOswald Buddenhagen2015-02-241-1/+1
|/ / | | | | | | Change-Id: I0f12e18ad97550ea444e21aa1008e7ed6bc68fcc
* | Use std math on doubles and include cmathSean Harmer2015-02-181-0/+2
| | | | | | | | | | | | | | | | Required to build on QNX 6.6. Change-Id: If45aef4e3c0488f390187858e8ecafb18d7f5960 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 10:46:24 +0000