summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Replace win32-g++ with mingw scopeKai Koehne2014-02-073-4/+4
| | | | | | | | | | Commit 773dd01 in qtbase introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. (see 278152fff for a similar commit in qtbase). Change-Id: I90c319bdda6b710bce4d2d883736716a70760127 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add configure test and build system files for JasPer.Jake Petroules2014-01-301-0/+65
| | | | | | Change-Id: Id3db7c5e7b3329adbea62c9d95323ead4e8a783f Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Import a copy of JasPer 1.900.1 for use by the JPEG 2000 plugin.Jake Petroules2014-01-30116-0/+42390
| | | | | | Change-Id: I85348aa66f8c3c145bbfd125f557d6a247046d8f Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Exclude non-supported imageformats for WinRTMaurice Kalinowski2014-01-281-0/+5
| | | | | Change-Id: Icaf64ef0b949e75402c1440826f24e42de96df62 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Refactor ICNS plugin to prepare it for icon variants supportAlex2014-01-142-142/+189
| | | | | | | Change-Id: I8bc799ade204072bdc169180154c2c2b021fd44e Reviewed-by: Ivan Komissarov <ABBAPOH@me.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Fix reading palette images in DDS handler.Ivan Komissarov2014-01-132-4/+39
| | | | | | | Change-Id: I039a5f3376a8ebe7230f30a0df31c4a355f22349 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Alex Char <prevedtest@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add ICNS (Apple Icon Image) plugin.Alex2013-12-178-1/+1228
| | | | | | | | | 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>
* Fix QDDSHandler::canRead to return false in case of a scan error.ABBAPOH2013-12-161-1/+5
| | | | | | | Change-Id: If776b122c90d79d430916677a46684770870956a Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Alex Char <prevedtest@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Do not try to rescan device in case of an error in DDS plugin.ABBAPOH2013-12-162-10/+18
| | | | | | | Change-Id: I64b49294476fc3bbf77620d839b88b0ecea68e23 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Alex Char <prevedtest@gmail.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Fix build of the DDS plugin without QDataStreamABBAPOH2013-12-135-1/+21
| | | | | Change-Id: I854c3bd82f244a6c45d91b08c3f1271538fd536a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Remove main.h in DDS plugin.ABBAPOH2013-12-133-71/+12
| | | | | Change-Id: I86b805d60755c463c321146e923469a9d7b006e4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix MSVC warnings about scopes.Friedemann Kleint2013-12-021-3/+3
| | | | | | | | | | | | | qddshandler.cpp(483) : warning C4258: 'i' : definition from the for loop is ignored; the definition from the enclosing scope is used qddshandler.cpp(477) : definition of 'i' ignored qddshandler.cpp(467) : definition of 'i' used qddshandler.cpp(486) : warning C4258: 'i' : definition from the for loop is ignored; the definition from the enclosing scope is used qddshandler.cpp(477) : definition of 'i' ignored qddshandler.cpp(467) : definition of 'i' used Change-Id: Ib911578900f012db20d9e50bdffa5d1ca9896a7e Reviewed-by: Ivan Komissarov <ABBAPOH@me.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix writing images in DDS handlerABBAPOH2013-12-021-7/+8
| | | | | Change-Id: If433528eb4cfa7448f171e083dd2bb559dbc2f4a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add support for QImageIOHandler::Size option in DDS handler.ABBAPOH2013-12-022-0/+23
| | | | | Change-Id: I7c9fc452142d9827269ebf9b6b2778c2b0eb55da Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add QByteArrayliterals to QDDSHandlerABBAPOH2013-12-022-8/+8
| | | | | | Change-Id: I9785fecffad5c82bacb846ba1d4dcdfda9af168b Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix capabilities in DDS image handler.ABBAPOH2013-12-011-2/+4
| | | | | Change-Id: Ic214fe9951bc8739cae4a8cd2517115a34ab80ba Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Whitespace fixes in DDS image handlerABBAPOH2013-12-011-5/+5
| | | | | Change-Id: I6da5d294065971f69cf90c285b2a6440502dc147 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Add Direct Draw Surface plugin to documentation and changelog.Jake Petroules2013-11-261-0/+1
| | | | | Change-Id: I866c65ecfbbe85822f8b8e9233098f56cb21d405 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add Direct Draw Surface pluginABBAPOH2013-11-2610-1/+2040
| | | | | | Change-Id: I8dfa6001c1aae2dcb5f2e6e0bfd142ef1f9dddbc Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Doc: Updated url variable in qdocconf files.v5.2.0-rc1v5.2.0Jerome Pasion2013-11-061-1/+1
| | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: I76ca42d3d9f125588ae72003d85b27ef1f9cee2d Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: aavit <eirik.aavitsland@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Fixes windows ce buildv5.2.0-beta1Bjoern Breitmeyer2013-10-073-4/+6
| | | | | | | | | | | The windows file seems to handle ce too in the new version of libtiff. Only the <sys/types> include and the not defined error handle were a problem. The error handler ifndef _WIN32_WCE can be removed as Qt builds libtiff without the gui integration. Change-Id: Idb025f64fc31d580566d8ce248137e57d01e96b2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Merge remote-tracking branch 'origin/stable' into devv5.2.0-alpha1Frederik Gladhorn2013-08-141-2/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | The inline keyword needs to be defined to __inline for MSVC when compiling C files. The patch removing the redefinition of inline does not work with the updated library, instead we resurrect the ifdef for MSVC only. Conflicts: src/3rdparty/libtiff/libtiff/tif_config.h Change-Id: I22bbaf3627fdb4f3dc60c9cd0f8d3282efc5bd2c
| * Make libtiff link on OS X 10.9old/5.1Gabriel de Dietrich2013-08-051-9/+0
| | | | | | | | | | | | | | | | | | Undefining the 'inline' keyword doesn't look very wise nowadays, and it did cause duplicate symbol erros at link time when linking against the 10.9 SDK. Change-Id: Ie6f8639fb920e57289c7d0ad8952603abcfe7377 Reviewed-by: aavit <eirik.aavitsland@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-08-051-1/+5
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ib841f2c7f6c0819ff9b41a11249331ca585d6d60
| * fix shadow build with -qt-zlib and pre-generated headersOswald Buddenhagen2013-07-301-1/+5
| | | | | | | | | | | | Task-number: QTBUG-32641 Change-Id: I4d0b4df50b652cf47e5f0b75b6d3c1f714414007 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Doc: Setting navigation variablesJerome Pasion2013-06-261-1/+3
| | | | | | | | | | | | | | -for the navigation bar Change-Id: If918610d2f80bf1bafffcef13851dc9f47aba8fd Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-121-0/+4
|\| | | | | | | Change-Id: I70792d10fb83d92b3b60e64b89c4dbf8144ccba5
| * Doc: Made "Qt Image Formats" entry in Assistant/Creator childless.v5.1.0-rc2v5.1.0-rc1v5.1.0Jerome Pasion2013-06-041-0/+4
| | | | | | | | | | | | | | | | The module doesn't really have any child documentation and it used to just list random overviews from other modules. Change-Id: I41021e7e649a1e0cbe430d80be55e9f601b00be0 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-047-25/+87
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf sync.profile Change-Id: I8f788167e37c9b9ca3f4a59a9785a435eeaa6317
| * TGA-Reader: Bail out of check if the device is not seekable.Friedemann Kleint2013-05-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | Suppress warning 'QIODevice::seek: Cannot call seek on a sequential device' which is emitted further down when attempting to restore the position of the file. Task-number: QTBUG-31081 Change-Id: Ib6a4b3eecaa61905a29020e5dd428f1516bfba7f Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
| * Doc: Fix module name in .qdocconfTopi Reinio2013-04-251-8/+8
| | | | | | | | | | | | | | | | | | Use CamelCase for module name(s) used in in .qdocconf - this is required as qdoc will generate visible output (tags in example manifest files) based on these names. Change-Id: I0f7240edff0abd66109dc568d37c30db3a21f215 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix MNG imageformat plugin build.Janne Anttila2013-04-182-15/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to build MNG image format plugin for WEC7 gives the error: Cannot open include file: 'qmnghandler_p.h': No such file or directory The correct INCLUDEPATH was already used in qmnghandler.pri, but it wasn't included anywhere. Refactored mng.pro to use qmnghandler.pri correspondingly as TIFF image format plugin uses qtiffhandler.pri Change-Id: Ie96c898b27747da3a34465eda2c6a3b923ad22c6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Johannes Oikarinen <johannes.oikarinen@digia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: aavit <eirik.aavitsland@digia.com>
| * Fix tiff imageformat plugin build for WEC7.Janne Anttila2013-04-123-2/+70
| | | | | | | | | | | | | | | | | | TIFF image format plugin requires lfind, which is not available in WEC7. Copied the relevant part of qfunctions_wince.cpp from qtbase repository. Change-Id: I3aec77b4d434af47cd2ecdf56a253acfdcba5314 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: aavit <eirik.aavitsland@digia.com>
* | Upgrading libtiff: Patches to libtiff 4.0.3 for Qt usageLiang Qi2013-04-052-49/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the collection of those earlier patches to libtiff in Qt that are still relevant, updated as required. For details, refer to the git history of the src/3rdparty/libtiff directory of Qt 4 and Qt 5/qtimageformats. All defines which happened in tiffconf.h were commented in tif_config.h. Done-with: aavit <eirik.aavitsland@digia.com> Task-number: QTBUG-25409 Change-Id: I8dc43f0dfe47e6472c3475d9e60ee304dc54ee3b Reviewed-by: aavit <eirik.aavitsland@digia.com>
* | Upgrading libtiff: Adding clean copy of libtiff 4.0.3Liang Qi2013-04-05159-14670/+22457
|/ | | | | | | | | | | | | | This commit removes the previous version of the bundled libtiff (3.9.2), as well as all local modifications to it. It adds an unmodified copy of the official libtiff source distribution, except that various extraneous files have been removed, as usual. The patches required to build it in Qt will follow in separate commit(s). Task-number: QTBUG-25409 Change-Id: If47e02c25ce1a2b3b47eff94a875e2abea0c7e1c Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Fix compilation for Android.v5.1.0-alpha1BogDan Vatra2013-03-272-1/+2
| | | | | Change-Id: Ide46bb5104022c5e54a1f2a8bd7822a14bcf603d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Merge branch 'dev' into stableSergio Ahumada2013-03-191-0/+8
|\ | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: I2fc10bd848450dd3102e8525ba226ce3aa027cdd
| * Fix glitch on MNG animation Loops when QMovie caching is enabledDavy Durham2013-01-041-0/+8
| | | | | | | | | | | | | | | | | | | | libmng delivers the last animation frame with a 1ms delay, and delivers an extra blank frame after that with the proper delay time, but this confuses QMovie when QMovie::cacheMode() == QMovie::CacheAll. Task-Number: QTBUG-28894 Change-Id: Ic508c886286d9ec6786482927f321c6d77b68619 Reviewed-by: aavit <eirik.aavitsland@digia.com>
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 08:28:16 +0000