summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix spelling errors in QTgaFile messages.Friedemann Kleint2013-02-061-2/+2
| | | | | Change-Id: I967f20698d161a52365c9bfea68ca0c7596b998b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix TIFFTAG_RESOLUTIONUNIT handling.Leonard Lee2013-02-051-3/+5
| | | | | | | | | If there is no TIFFTAG_RESOLUTIONUNIT record, the value of resUnit should be RESUNIT_INCH and not RESUNIT_NONE. Task-number: QTBUG-22322 Change-Id: Idb1ffeec85fdb5a23d93fa53505440a9e2f8914e Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Use QTgaFile as translation context.Friedemann Kleint2013-02-052-10/+13
| | | | | Change-Id: I2042a031a3618a361cf3f98628978d3f2581baed Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* fix doc page urlsOswald Buddenhagen2013-02-011-1/+1
| | | | | | | they are versioned nowadays Change-Id: I995432d9892e9f0444b7c01f04e264aa00aeab55 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-011-2/+2
| | | | | Change-Id: I1a61c89695b28e64000c82156bfbe0f22a45be7f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* doc: Fix namespace version to 5.0.1 for qhp documentationv5.0.1Sergio Ahumada2013-01-121-1/+1
| | | | | Change-Id: I1aa4d8dfd2f89707b1451d7b083e5b98243df9a3 Reviewed-by: hjk <qthjk@ovi.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-0215-15/+15
| | | | | Change-Id: I82e67b5704007d838d6ab1ee1bc9a870bff7d4c8 Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Bump Qt version to 5.0.1Sergio Ahumada2012-12-231-1/+1
| | | | | Change-Id: I42f69c3f79412fef5d0c8661e7565897375add5d Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Add PLUGIN_CLASS_NAME to qtimageformats pluginsv5.0.0-rc2v5.0.0Miikka Heikkinen2012-12-104-0/+4
| | | | | | | | | | | Needed for automating static plugin loading. Task-number: QTBUG-28131 # ==[ Subject: One line only short meaningful description for logs ]===| Change-Id: I15365a9ccf1a5b136ea7e01c4530108631498a2a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix compilation after removal of TRUE macroSergio Ahumada2012-12-061-1/+1
| | | | | | | | | This macro was removed by qtbase/158f39ec7870c54ff3a15f72fe151062d6daa172 but it seems like it was misused anyways. This function should return a mng_bool (MNG_TRUE) instead. Change-Id: I6f390e32faec18c52e5d7f659015cea8be4d27a5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: misc fixesv5.0.0-rc1aavit2012-12-043-28/+14
| | | | | Change-Id: Iaf5bada4c0ba74d1a1b869edf54bd50302ca4372 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* remove symbian vestigesOswald Buddenhagen2012-12-032-3/+0
| | | | | Change-Id: I1741d93a762f3d713831e2a4815eda63b9001aba Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Fix: include path to Qt zlibaavit2012-12-011-1/+1
| | | | | Change-Id: I8142a77d45007c69bfccc0d6d471205153e2de03 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Doc: fix doc generation and add module overview (landing) pageaavit2012-11-308-1/+913
| | | | | Change-Id: I68df54cfa83a600d7fc3ada0437ffec0b14c385b Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Use the bundled zlib in QtCore, if present.aavit2012-11-292-8/+6
| | | | | | | Ref. Ie986f47e00fd0c16f2ba04d27f4258a20d61b260 Change-Id: I902cd52c2f08466cf6f42cc5e1813206e2051e95 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* QImage plugins should report supported mime typesAllan Sandfeld Jensen2012-11-284-4/+8
| | | | | | | | | Extend JSON plugin descriptions with supported MIME types. Task-number: QTBUG-28177 Change-Id: If8e64a4a0f052718510383a74622598d741640d3 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix preprocessor directives syntax formDebao Zhang2012-11-282-2/+2
| | | | | Change-Id: I3cf89ce6dae4076b2776026957db13f3aee9ec8f Reviewed-by: aavit <eirik.aavitsland@digia.com>
* adjust to qt_plugin.prf changesv5.0.0-beta2Oswald Buddenhagen2012-11-014-16/+8
| | | | | | | | DESTDIR and INSTALLS+=target are set up automatically now, but PLUGIN_TYPE needs to be defined. Change-Id: I5dd40f4fb6bfc6723ed96241f41301b32393dd34 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2314-336/+336
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ia126f46d5f67e9acf9e2efc8bf99c50fd1c22809 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix qmake syntax problem in zlib_dependency.pri.Christian Kandeler2012-09-111-1/+1
| | | | | | | | Without the double quotes, the apostrophe is considered an unmatched single quote by the pro file parser. Change-Id: Ibd1b38e2b714b0a99baf95c4e69fe87a0a962630 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Enable configure tests for system libmng and libtiffLars Knoll2012-08-083-15/+12
| | | | | | | | | | | The current code didn't run the tests anymore, but was still based on the assumption that qtbase/configure set up the right configuration. Clean up the pro files for mng and tiff while we're at it. Change-Id: Iee46c183fda57ec07b60a80089af7925db959c40 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remove commented out QTDIR_build conditionalsOswald Buddenhagen2012-06-292-4/+0
| | | | | | | re-enabling them would not work anymore anyway Change-Id: Iea3c7e4691ce7e43e6aeed8db7f41664d170810e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix warning in profile.qt-v5.0.0-alpha1Friedemann Kleint2012-03-121-1/+1
| | | | | Change-Id: I3f38e242e0519bffd297a9073a65875946beed05 Reviewed-by: aavit <qt_aavit@ovi.com>
* Add wbmp pluginaavit2012-03-016-1/+564
| | | | | | | | | | | This is a port to Qt 5/qtimageformats of the contribution https://qt.gitorious.org/qt/qt/merge_requests/1117 by Dmitry Zelenkovskiy <Dmitry.Zelenkovskiy@nokia.com> Change-Id: I9cdd249d3c58c5f922ccd2d43f92f1bd2e3fd86f Reviewed-by: Jason Barron <jason.barron@nokia.com> Reviewed-by: aavit <qt_aavit@ovi.com>
* Use new plugin system in QtImageFormats.Friedemann Kleint2012-02-179-9/+28
| | | | | Change-Id: Ib1d37b12d35db19f3b12d1881d29d3e0154d414d Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Move tga support from Qt3d to QtImageFormats.Toby Tomkins2012-02-087-1/+740
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rev-By: Samuel Rodal Fix-for: QTBUG-21955 Part of fix for https://bugreports.qt.nokia.com/browse/QTBUG-21955 Having tga plugin inside a Qt add-on causes packaging problems. There have been many queries over the years for tga support even tho it is a niche image format. It is particularly useful for OpenGL work as a texture format since it is a blittable bitmap, but it is very innefficient compared to png or jpg. For this reason only read support is added, and this is documented. Also add one unit test. (based on cherry picked from Qt 4.8 commit 951a997893407b0a26f21fe0acec4701fa3d4279) Adds code removed from Qt3D. http://codereview.qt-project.org/#change,13898 Conflicts: tests/auto/qimagereader/qimagereader.pro tests/auto/qimagereader/tst_qimagereader.cpp Change-Id: Ia1b7420dd3461cb1d2f1d857d11444a0a533de43 Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Add TIFF pluginKent Hansen2012-02-01219-1/+70586
| | | | | | | | | Moved out from qtbase. Task-number: QTBUG-23887 Change-Id: I57d30173e6624d41dba1610084a7ed949ae84d1d Reviewed-by: aavit <qt_aavit@ovi.com> Sanity-Review: Kent Hansen <kent.hansen@nokia.com>
* Remove "All rights reserved" line from license headers.Toby Tomkins2012-02-013-6/+6
| | | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ifd6d629498499b72fbe2b393f25c774a72de9456 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Long live the qtimageformats moduleKent Hansen2012-01-2584-0/+99699
This module contains plugins for image formats that aren't part of the "core" (qtbase) offering, starting with mng. Task-number: QTBUG-21869 Change-Id: I85e51ed6f84c07419b1676f9def234c36f10141f Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: aavit <qt_aavit@ovi.com>