summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 changes file for 5.0.1 releaseSergio Ahumada2013-01-111-5/+1
| | | | | Change-Id: I4c5b39fe0b9c8423a56c669c0ec454802e1d1963 Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Merge branch 'stable' into releaseSergio Ahumada2013-01-0926-24/+78
|\ | | | | | | Change-Id: Ic5a64ac86998e5a55f1b988e1b750873809e5a29
| * Update copyright year in Digia's license headersSergio Ahumada2013-01-0223-23/+23
| | | | | | | | | | Change-Id: I82e67b5704007d838d6ab1ee1bc9a870bff7d4c8 Reviewed-by: aavit <eirik.aavitsland@digia.com>
| * Add changes-5.0.1 fileSergio Ahumada2012-12-241-0/+51
| | | | | | | | | | | | Task-number: QTBUG-26065 Change-Id: I9ac06383810ab15546635fa7dda39813a069da1b 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 qmake generated files to .gitignore.Miikka Heikkinen2012-12-201-0/+3
| | | | | | | | | | | | | | | | Add source files generated by qmake for automatic static plugin imports to .gitignore. Change-Id: I8f7d72827b4fcea3811815a088012f92f4f83e38 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | point dependencies to 'release' branchesSergio Ahumada2012-12-181-1/+1
|/ | | | | | Change-Id: Ice5b28077b2d12203a8d3194497f2f312b2264db Reviewed-by: aavit <eirik.aavitsland@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.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>
* sync.profile: Point dependencies to 'refs/heads/stable'Sergio Ahumada2012-12-041-1/+1
| | | | | | | | | | | | We should test stable branches against stable branches only. At some point we should automate the merges from dev->stable->release and decide how to handle possible merge conflicts. This is good enough for the time being. Change-Id: I42f68dd5f073a466cecbe9d811a0152af7256895 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Janne Anttila <janne.anttila@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>
* test: Mark tst_qtiff as insignificantSergio Ahumada2012-12-011-0/+2
| | | | | | Task-number: QTBUG-28320 Change-Id: I2cc7e01c0d7cc525ba4423006c1cc876f6b66942 Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Doc: fix doc generation and add module overview (landing) pageaavit2012-11-308-11/+82
| | | | | 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>
* Updated qtimageformats.qdocconfSergio Ahumada2012-11-271-11/+16
| | | | | Change-Id: Ie0423b313d12a2b19db4f7ed4b63ce19f53b21d4 Reviewed-by: Lars Knoll <lars.knoll@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>
* Add .qmake.conf with load(qt_build_config) like other Qt modulesTor Arne Vestbø2012-10-221-0/+1
| | | | | Change-Id: Id7ade8a50ef0e91a6a0e5aa949a45b806deca769 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* HTML template: Updated copyright notice from Nokia to Digia PlcJerome Pasion2012-09-262-29/+4
| | | | | Change-Id: Ia1a5cbe98eaeca91121f0fbd394419f8ff1c82f7 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-2322-529/+529
| | | | | | | | 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>
* Doc: Adding documentation templates from qtbaseJerome Pasion2012-09-213-0/+776
| | | | | | | | These templates must be included in the qdocconf files. Task-number: QTBUG-27293 Change-Id: Ie912cae404951f0102e0264d462d786025f388d0 Reviewed-by: Martin Smith <martin.smith@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>
* Update the git-archive export optionsThiago Macieira2012-09-032-0/+4
| | | | | | | | | | | | | | The .gitattributes and .gitignore files do not need to be present in packaged sources, as they are for people using the Git repository. People who download tarballs usually don't reimport into Git -- they should just download the actual repositories. Meanwhile, the .tag file is quite useful. Instead of making Git extract to the useless SHA-1 of the $n string, ask git-archive to store the SHA-1 of the commit being packaged. Change-Id: I0c93d28c4a96d4479f141c18f3234e5252be6d7c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Cleanup doc/doc.pri that runs obsolete qdoc3v5.0.0-beta1J-P Nurmi2012-08-222-17/+0
| | | | | | | Use QMAKE_DOCS instead, if the module has docs in the future. Change-Id: I839391f1e19d24ed162840fa9932dd2b50b68151 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* clean upOswald Buddenhagen2012-08-141-10/+0
| | | | | | | there are no qt modules here, so these lines will never be used Change-Id: I85930c993a8befc9607dc1f792074da42334e0ad Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Enable configure tests for system libmng and libtiffLars Knoll2012-08-088-15/+16
| | | | | | | | | | | 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>
* use centralized handling of QT_BUILD_PARTSOswald Buddenhagen2012-07-091-16/+1
| | | | | Change-Id: I2de2ac4d37ab6b9eda0dfbb2802671a62120d405 Reviewed-by: Rohan McGovern <rohan.mcgovern@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>
* remove qmake -project boilerplateOswald Buddenhagen2012-06-256-18/+0
| | | | | Change-Id: I22368f64dcb046b2d0a0296ff506be4a02acd887 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Add .gitignore fileYuchen Deng2012-04-101-0/+16
| | | | | Change-Id: I8f3054dbfb576a68c241d56b64efd17b3fa421f8 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-0112-2/+661
| | | | | | | | | | | 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-0812-2/+834
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-01268-4/+71397
| | | | | | | | | 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-016-12/+14
| | | | | | | | | | | 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-25104-0/+100144
| | | | | | | | | | 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>
* Initial commitRohan McGovern2012-01-240-0/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 12:49:21 +0000