qt:qtimageformats.git
3 years agoBump version
Oswald Buddenhagen [Tue, 17 Jun 2014 22:36:02 +0000 (00:36 +0200)]
Bump version

Change-Id: I76c25993967a23329da5983a13a6198662566c58

3 years agoMake QWebpHandler::write() work on big endian systems stable v5.3.1
Dmitry Shachnev [Thu, 29 May 2014 06:58:33 +0000 (10:58 +0400)]
Make QWebpHandler::write() work on big endian systems

Currently, we convert image to Format_ARGB32. This means that on big
endian systems the order of bytes will be (0xAA, 0xRR, 0xGG, 0xBB).
However, in WebP library there is no function to import bytes in
ARGB format.

This commit makes us use Format_RGBA8888 and WebPPictureImportRGBA
on big endian systems, which will make the function work correctly.

Change-Id: I5f347f3ec66f0a57df0d40d4900b1573f9400506
Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
Reviewed-by: aavit <eirik.aavitsland@digia.com>
3 years agoBump MODULE_VERSION to 5.3.1
Sergio Ahumada [Thu, 17 Apr 2014 15:21:21 +0000 (17:21 +0200)]
Bump MODULE_VERSION to 5.3.1

Change-Id: If8c86e33a045ea50d957a2a68c204a8de2fad65c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
3 years agoRemove unused and unlinked qdocconf file from the project. v5.3.0 v5.3.0-beta1 v5.3.0-rc1
Jędrzej Nowacki [Fri, 7 Mar 2014 11:46:53 +0000 (12:46 +0100)]
Remove unused and unlinked qdocconf file from the project.

Change-Id: I2d0b60c47d92ba82e04a0d90877bda6b287f5a85
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
3 years agoAdded webp information in doc and changelog v5.3.0-alpha1
Liang Qi [Thu, 20 Feb 2014 12:58:59 +0000 (13:58 +0100)]
Added webp information in doc and changelog

Change-Id: I1287608e914598c58acff70a47f71cc0bf36f094
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoAdded webp image format plugin
Steven Yao [Thu, 25 Apr 2013 07:26:53 +0000 (09:26 +0200)]
Added webp image format plugin

Also added auto test and config test.

This plugin was disabled on winrt and android.

[ChangeLog] Added webp image format plugin.

Task-number: QTBUG-14205

Done-with: Liang Qi <liang.qi@digia.com>
Change-Id: I9409e894d7fc1aef9dce4ffdff8bdf483d689774
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoAdding libwebp: Patches to libwebp 0.4.0 for Qt usage
Liang Qi [Thu, 25 Apr 2013 07:25:07 +0000 (09:25 +0200)]
Adding libwebp: Patches to libwebp 0.4.0 for Qt usage

Task-number: QTBUG-14205
Change-Id: Id7c3f4d9398b613a18033d8f3f624448f31ce33d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoAdding libwebp: Adding clean copy of libwebp 0.4.0
Liang Qi [Thu, 23 Jan 2014 10:21:03 +0000 (11:21 +0100)]
Adding libwebp: Adding clean copy of libwebp 0.4.0

This commit imports libwebp 0.4.0, 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).

Task-number: QTBUG-14205
Change-Id: I747918fe2a07716f66cffb795129f7aa5e067759
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoAdd JPEG 2000 plugin.
Jake Petroules [Mon, 6 Jan 2014 12:52:54 +0000 (07:52 -0500)]
Add JPEG 2000 plugin.

It is moving from Qt Solutions.

Change-Id: Ie0dc44d258597f871544fa43238528f42628b799
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
3 years agoUse RGBA8888 format to simplify TIFF writing
Allan Sandfeld Jensen [Fri, 31 Jan 2014 14:36:05 +0000 (15:36 +0100)]
Use RGBA8888 format to simplify TIFF writing

We write TIFF files using big-endian RGBA, by using the RGBA8888 QImage
format we can remove the manual conversion done in qtiffhandler.

Change-Id: I4a7f4810ce4332d1608813d9cd6371bc13d94df0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
3 years agoReplace win32-g++ with mingw scope
Kai Koehne [Fri, 17 Jan 2014 13:38:08 +0000 (14:38 +0100)]
Replace win32-g++ with mingw scope

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>
3 years agoAdd configure test and build system files for JasPer.
Jake Petroules [Mon, 6 Jan 2014 13:35:16 +0000 (08:35 -0500)]
Add configure test and build system files for JasPer.

Change-Id: Id3db7c5e7b3329adbea62c9d95323ead4e8a783f
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoImport a copy of JasPer 1.900.1 for use by the JPEG 2000 plugin.
Jake Petroules [Mon, 6 Jan 2014 13:34:32 +0000 (08:34 -0500)]
Import a copy of JasPer 1.900.1 for use by the JPEG 2000 plugin.

Change-Id: I85348aa66f8c3c145bbfd125f557d6a247046d8f
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoExclude non-supported imageformats for WinRT
Maurice Kalinowski [Tue, 28 Jan 2014 11:52:46 +0000 (12:52 +0100)]
Exclude non-supported imageformats for WinRT

Change-Id: Icaf64ef0b949e75402c1440826f24e42de96df62
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
3 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Fri, 17 Jan 2014 16:13:43 +0000 (17:13 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: I2268e648a3d65f8ff6dbc0e954e0729a2e751664

3 years agoBump MODULE_VERSION to 5.2.2 old/5.2
Sergio Ahumada [Wed, 15 Jan 2014 21:56:48 +0000 (22:56 +0100)]
Bump MODULE_VERSION to 5.2.2

Change-Id: Ibafe0f44c0235517bf8b7ac85f4baa2d3a728f34
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
3 years agoRefactor ICNS plugin to prepare it for icon variants support
Alex [Mon, 30 Dec 2013 16:07:34 +0000 (20:07 +0400)]
Refactor ICNS plugin to prepare it for icon variants support

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>
3 years agoFix reading palette images in DDS handler.
Ivan Komissarov [Sun, 12 Jan 2014 06:59:54 +0000 (10:59 +0400)]
Fix reading palette images in DDS handler.

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>
3 years agoAdd ICNS (Apple Icon Image) plugin.
Alex [Mon, 16 Dec 2013 18:32:39 +0000 (22:32 +0400)]
Add ICNS (Apple Icon Image) plugin.

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>
3 years agoFix QDDSHandler::canRead to return false in case of a scan error.
ABBAPOH [Fri, 13 Dec 2013 15:27:03 +0000 (19:27 +0400)]
Fix QDDSHandler::canRead to return false in case of a scan error.

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>
3 years agoDo not try to rescan device in case of an error in DDS plugin.
ABBAPOH [Fri, 13 Dec 2013 15:21:27 +0000 (19:21 +0400)]
Do not try to rescan device in case of an error in DDS plugin.

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>
4 years agoFix build of the DDS plugin without QDataStream
ABBAPOH [Fri, 13 Dec 2013 15:12:23 +0000 (19:12 +0400)]
Fix build of the DDS plugin without QDataStream

Change-Id: I854c3bd82f244a6c45d91b08c3f1271538fd536a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
4 years agoRemove main.h in DDS plugin.
ABBAPOH [Fri, 13 Dec 2013 15:08:32 +0000 (19:08 +0400)]
Remove main.h in DDS plugin.

Change-Id: I86b805d60755c463c321146e923469a9d7b006e4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
4 years agoFix MSVC warnings about scopes.
Friedemann Kleint [Mon, 2 Dec 2013 08:13:24 +0000 (09:13 +0100)]
Fix MSVC warnings about scopes.

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>
4 years agoFix writing images in DDS handler
ABBAPOH [Sun, 1 Dec 2013 08:47:53 +0000 (12:47 +0400)]
Fix writing images in DDS handler

Change-Id: If433528eb4cfa7448f171e083dd2bb559dbc2f4a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
4 years agoAdd support for QImageIOHandler::Size option in DDS handler.
ABBAPOH [Sun, 1 Dec 2013 08:47:10 +0000 (12:47 +0400)]
Add support for QImageIOHandler::Size option in DDS handler.

Change-Id: I7c9fc452142d9827269ebf9b6b2778c2b0eb55da
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
4 years agoAdd QByteArrayliterals to QDDSHandler
ABBAPOH [Sun, 1 Dec 2013 08:44:48 +0000 (12:44 +0400)]
Add QByteArrayliterals to QDDSHandler

Change-Id: I9785fecffad5c82bacb846ba1d4dcdfda9af168b
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
4 years agoFix capabilities in DDS image handler.
ABBAPOH [Sun, 1 Dec 2013 08:42:58 +0000 (12:42 +0400)]
Fix capabilities in DDS image handler.

Change-Id: Ic214fe9951bc8739cae4a8cd2517115a34ab80ba
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
4 years agoWhitespace fixes in DDS image handler
ABBAPOH [Sun, 1 Dec 2013 08:42:12 +0000 (12:42 +0400)]
Whitespace fixes in DDS image handler

Change-Id: I6da5d294065971f69cf90c285b2a6440502dc147
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Fri, 29 Nov 2013 15:03:20 +0000 (16:03 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf

Change-Id: Ib695c2e2c8629e1947c24ba6510ecb4194b949dc

4 years agoAdd Direct Draw Surface plugin to documentation and changelog.
Jake Petroules [Tue, 26 Nov 2013 12:33:41 +0000 (07:33 -0500)]
Add Direct Draw Surface plugin to documentation and changelog.

Change-Id: I866c65ecfbbe85822f8b8e9233098f56cb21d405
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
4 years agoAdd Direct Draw Surface plugin
ABBAPOH [Wed, 13 Nov 2013 16:00:27 +0000 (20:00 +0400)]
Add Direct Draw Surface plugin

Change-Id: I8dfa6001c1aae2dcb5f2e6e0bfd142ef1f9dddbc
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
4 years agoBump MODULE_VERSION to 5.2.1 v5.2.1
Sergio Ahumada [Mon, 25 Nov 2013 11:47:18 +0000 (12:47 +0100)]
Bump MODULE_VERSION to 5.2.1

Change-Id: I979cdf4dd3f1a8d2e3b73c9fce8507a4ce97198d
Reviewed-by: Matti Paaso <matti.paaso@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
4 years agoRecognize newer libmng versions in config test
aavit [Fri, 22 Nov 2013 14:04:23 +0000 (15:04 +0100)]
Recognize newer libmng versions in config test

libmng 2.0.x has been released and is compatible and usable, but since
it no longer provides a VERSION_MAJOR macro, the config test would fail.

Task-number: QTBUG-34894
Change-Id: I106aa258de0851af01d1bb016c2971dd8e30fd24
Reviewed-by: Liang Qi <liang.qi@digia.com>
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Sergio Ahumada [Fri, 8 Nov 2013 17:11:26 +0000 (18:11 +0100)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I93b2a2e074fc7163b77e3f0edd826266819a2c36

4 years agoDoc: Updated url variable in qdocconf files. v5.2.0 v5.2.0-rc1
Jerome Pasion [Tue, 5 Nov 2013 12:18:15 +0000 (13:18 +0100)]
Doc: Updated url variable in qdocconf files.

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>
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Fri, 11 Oct 2013 14:15:22 +0000 (16:15 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I89d0db8f8928e8763b3a9e6fa9ae1cda6e18a76f

4 years agoFixes windows ce build v5.2.0-beta1
Bjoern Breitmeyer [Mon, 7 Oct 2013 12:17:00 +0000 (14:17 +0200)]
Fixes windows ce build

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>
4 years agoBump qtimageformats version to 5.3.0
Sergio Ahumada [Tue, 24 Sep 2013 18:31:04 +0000 (20:31 +0200)]
Bump qtimageformats version to 5.3.0

Change-Id: Ia8ccce11e5b356456e04a7f47a119caa3bbf00dd
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
4 years agoMerge remote-tracking branch 'origin/stable' into dev v5.2.0-alpha1
Frederik Gladhorn [Wed, 14 Aug 2013 10:38:11 +0000 (12:38 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

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

4 years agoMake libtiff link on OS X 10.9 old/5.1
Gabriel de Dietrich [Mon, 5 Aug 2013 11:58:37 +0000 (13:58 +0200)]
Make libtiff link on OS X 10.9

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>
4 years agoMerge branch 'stable' into dev
Sergio Ahumada [Mon, 5 Aug 2013 08:40:01 +0000 (10:40 +0200)]
Merge branch 'stable' into dev

Conflicts:
.qmake.conf

Change-Id: Ib841f2c7f6c0819ff9b41a11249331ca585d6d60

4 years agofix shadow build with -qt-zlib and pre-generated headers
Oswald Buddenhagen [Mon, 29 Jul 2013 16:35:48 +0000 (18:35 +0200)]
fix shadow build with -qt-zlib and pre-generated headers

Task-number: QTBUG-32641
Change-Id: I4d0b4df50b652cf47e5f0b75b6d3c1f714414007
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
4 years agoMerge remote-tracking branch 'origin/release' into stable
Sergio Ahumada [Fri, 26 Jul 2013 19:50:47 +0000 (21:50 +0200)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I64a312169c1234a0a26a582bde2c08bb7e9c718e

4 years agoBump MODULE_VERSION to 5.1.2
Sergio Ahumada [Tue, 23 Jul 2013 10:01:41 +0000 (12:01 +0200)]
Bump MODULE_VERSION to 5.1.2

Change-Id: I59c494d5a9e95296ce403d3feb0167e8d3fd0b94
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
4 years agoAdd changes-5.1.1 file v5.1.1
Sergio Ahumada [Mon, 22 Jul 2013 11:05:09 +0000 (13:05 +0200)]
Add changes-5.1.1 file

Change-Id: Ie1c9020281ce5e0d591c0bc9393d4fe0babd6745
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
4 years agoDoc: Setting navigation variables
Jerome Pasion [Wed, 26 Jun 2013 08:15:28 +0000 (10:15 +0200)]
Doc: Setting navigation variables

-for the navigation bar

Change-Id: If918610d2f80bf1bafffcef13851dc9f47aba8fd
Reviewed-by: Martin Smith <martin.smith@digia.com>
4 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Wed, 12 Jun 2013 17:26:22 +0000 (19:26 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I70792d10fb83d92b3b60e64b89c4dbf8144ccba5

4 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Wed, 12 Jun 2013 12:45:17 +0000 (14:45 +0200)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Ie3ca435442bcaab4d77fee973b82967741055628

4 years agoMerge remote-tracking branch 'origin/stable' into dev
Frederik Gladhorn [Tue, 4 Jun 2013 17:46:58 +0000 (19:46 +0200)]
Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
.qmake.conf
sync.profile

Change-Id: I8f788167e37c9b9ca3f4a59a9785a435eeaa6317

4 years agoDoc: Made "Qt Image Formats" entry in Assistant/Creator childless. v5.1.0 v5.1.0-rc1 v5.1.0-rc2
Jerome Pasion [Fri, 31 May 2013 11:45:02 +0000 (13:45 +0200)]
Doc: Made "Qt Image Formats" entry in Assistant/Creator childless.

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>
4 years agoBump MODULE_VERSION to 5.1.1
Sergio Ahumada [Tue, 28 May 2013 18:23:13 +0000 (20:23 +0200)]
Bump MODULE_VERSION to 5.1.1

Change-Id: I9b0c63863a4c1914f15bdbba6c02758622403ed9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
4 years agosync.profile: Point dependencies to an empty string
Sergio Ahumada [Fri, 24 May 2013 20:16:12 +0000 (22:16 +0200)]
sync.profile: Point dependencies to an empty string

This means that we are going to use the same branch name for the
dependencies as the branch of the repository under test.

If we are testing the 'stable' branch, all dependencies will point
to the 'stable' branch as well.

Change-Id: I3240876d8eea81f8313983e542ff94603d4768bf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
4 years agoAdd changes-5.1.0 file
Sergio Ahumada [Mon, 13 May 2013 18:23:57 +0000 (20:23 +0200)]
Add changes-5.1.0 file

Change-Id: I07a808d9cf153e1cc0cfcfd2d5243b4dee8b3355
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
4 years agotest: Remove insignificant_test from tst_qtiff
Sergio Ahumada [Mon, 13 May 2013 11:10:34 +0000 (13:10 +0200)]
test: Remove insignificant_test from tst_qtiff

This test is now passing on all CI platforms.

Task-number: QTBUG-28320
Change-Id: I6e0977980cfe788a087646eb751b113f83e8dd12
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Reviewed-by: aavit <eirik.aavitsland@digia.com>
4 years agoTGA-Reader: Bail out of check if the device is not seekable.
Friedemann Kleint [Mon, 13 May 2013 10:48:52 +0000 (12:48 +0200)]
TGA-Reader: Bail out of check if the device is not seekable.

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>
4 years agodisable module when gui is not available v5.1.0-beta1
Tasuku Suzuki [Tue, 8 Jan 2013 13:19:36 +0000 (22:19 +0900)]
disable module when gui is not available

Change-Id: I18b11dd3c32697e24e82ec1f04ee9bad5e424e82
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
4 years agoDoc: Fix module name in .qdocconf
Topi Reinio [Fri, 19 Apr 2013 11:30:28 +0000 (13:30 +0200)]
Doc: Fix module name in .qdocconf

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>
4 years agoFix MNG imageformat plugin build.
Janne Anttila [Tue, 19 Jun 2012 06:25:42 +0000 (09:25 +0300)]
Fix MNG imageformat plugin build.

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>
4 years agoFix tiff imageformat plugin build for WEC7.
Janne Anttila [Fri, 22 Mar 2013 11:26:06 +0000 (13:26 +0200)]
Fix tiff imageformat plugin build for WEC7.

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>
4 years agoMerge branch 'release' into stable
Sergio Ahumada [Wed, 10 Apr 2013 18:23:26 +0000 (20:23 +0200)]
Merge branch 'release' into stable

Change-Id: I1937fdd293d96a6926749f800bcbccca7a73486d

4 years agoUpgrading libtiff: Patches to libtiff 4.0.3 for Qt usage
Liang Qi [Mon, 4 Mar 2013 09:26:56 +0000 (10:26 +0100)]
Upgrading libtiff: Patches to libtiff 4.0.3 for Qt usage

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>
4 years agoUpgrading libtiff: Adding clean copy of libtiff 4.0.3
Liang Qi [Mon, 4 Mar 2013 09:22:52 +0000 (10:22 +0100)]
Upgrading libtiff: Adding clean copy of libtiff 4.0.3

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>
4 years agoUpdate module version to 5.2.0
Sergio Ahumada [Tue, 2 Apr 2013 14:52:11 +0000 (16:52 +0200)]
Update module version to 5.2.0

Change-Id: Iea133e4779c946aa144d4db3ccee2f0cdac9d3fa
Reviewed-by: David Faure (KDE) <faure@kde.org>
4 years agoMerge branch 'stable' into dev
Sergio Ahumada [Tue, 2 Apr 2013 14:51:16 +0000 (16:51 +0200)]
Merge branch 'stable' into dev

Change-Id: I4890e881fd9c9b7309168157279faec2011a212f

4 years agoFix the config.tests to correctly detect the 3rd party libraries
Andy Shaw [Wed, 20 Mar 2013 13:19:21 +0000 (14:19 +0100)]
Fix the config.tests to correctly detect the 3rd party libraries

When building with Visual C++ it would not detect the 3rd party
libraries because it does not include the lib prefix. So this now
accounts for this. Additionally console is added to the CONFIG line so
there is no need for a WinMain() function.

Change-Id: I5be0114ef609e19ce1da612cac7781aaf748f552
Reviewed-by: aavit <eirik.aavitsland@digia.com>
4 years agoFix compilation for Android. v5.1.0-alpha1
BogDan Vatra [Thu, 3 Jan 2013 17:30:00 +0000 (19:30 +0200)]
Fix compilation for Android.

Change-Id: Ide46bb5104022c5e54a1f2a8bd7822a14bcf603d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
4 years agoBump MODULE_VERSION to 5.1.0
Sergio Ahumada [Mon, 25 Mar 2013 10:12:04 +0000 (11:12 +0100)]
Bump MODULE_VERSION to 5.1.0

Change-Id: Ibaf929633f97edd2211b28799957bd1a7f7a0f08
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
4 years agoAdd changes-5.0.2 file v5.0.2
Sergio Ahumada [Tue, 19 Mar 2013 20:01:44 +0000 (21:01 +0100)]
Add changes-5.0.2 file

Change-Id: I733f11ad3879575a9390f04a4be97d86660498ea
Reviewed-by: aavit <eirik.aavitsland@digia.com>
4 years agoMerge branch 'dev' into stable
Sergio Ahumada [Tue, 19 Mar 2013 08:20:55 +0000 (09:20 +0100)]
Merge branch 'dev' into stable

This starts Qt 5.1 release cycle

Change-Id: I2fc10bd848450dd3102e8525ba226ce3aa027cdd

4 years agoMerge remote-tracking branch 'origin/release' into stable
Oswald Buddenhagen [Mon, 18 Mar 2013 13:04:16 +0000 (14:04 +0100)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I03081121451c40b7103f8d17d3a3acea370f7528

4 years agodefine MODULE_VERSION
Oswald Buddenhagen [Tue, 26 Feb 2013 11:58:47 +0000 (12:58 +0100)]
define MODULE_VERSION

Task-number: QTBUG-29838
Change-Id: If5f717c32de6cbb91f09f4dd9914e1d5ff759880
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
4 years agoMerge branch 'stable' into release
Oswald Buddenhagen [Wed, 20 Feb 2013 18:41:41 +0000 (19:41 +0100)]
Merge branch 'stable' into release

Change-Id: I60bd4e3d7ed8aa09c6606fb0476fa34f882cb8e3

4 years agoAdd license files mandated by (L)GPL.
Timo Jyrinki [Fri, 8 Feb 2013 07:18:57 +0000 (09:18 +0200)]
Add license files mandated by (L)GPL.

Currently only qtbase includes the required LICENSE files, which
are referred to from the code headers. The same files should
be distributed as part of all the modules as well, so that the
(L)GPL licenses are adhered.

These files were wget:d from:

https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL

As an addition to above, added also LICENSE.FDL. All the modules
additionally require it, since they include at least *.qdoc files and in
some cases a couple of others.

File received via
wget http://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL

Change-Id: I0dfed51a58e17c90eb943c0a0cb79b6ebd6b49d0
Reviewed-by: Jason McDonald <macadder1@gmail.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
4 years agoFix spelling errors in QTgaFile messages.
Friedemann Kleint [Wed, 6 Feb 2013 07:54:57 +0000 (08:54 +0100)]
Fix spelling errors in QTgaFile messages.

Change-Id: I967f20698d161a52365c9bfea68ca0c7596b998b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
4 years agoFix TIFFTAG_RESOLUTIONUNIT handling.
Leonard Lee [Mon, 4 Feb 2013 14:03:05 +0000 (15:03 +0100)]
Fix TIFFTAG_RESOLUTIONUNIT handling.

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>
4 years agoUse QTgaFile as translation context.
Friedemann Kleint [Mon, 4 Feb 2013 16:29:32 +0000 (17:29 +0100)]
Use QTgaFile as translation context.

Change-Id: I2042a031a3618a361cf3f98628978d3f2581baed
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
4 years agofix doc page urls
Oswald Buddenhagen [Wed, 30 Jan 2013 17:09:08 +0000 (18:09 +0100)]
fix doc page urls

they are versioned nowadays

Change-Id: I995432d9892e9f0444b7c01f04e264aa00aeab55
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
4 years agosubstitute fixed version numbers in qdocconf files with variables
Oswald Buddenhagen [Wed, 30 Jan 2013 16:39:26 +0000 (17:39 +0100)]
substitute fixed version numbers in qdocconf files with variables

Change-Id: I1a61c89695b28e64000c82156bfbe0f22a45be7f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
4 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Fri, 18 Jan 2013 16:20:59 +0000 (17:20 +0100)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I1dda698c407edec1309116c86584e4954da81c36

4 years agodoc: Fix namespace version to 5.0.1 for qhp documentation v5.0.1
Sergio Ahumada [Sat, 12 Jan 2013 08:04:03 +0000 (09:04 +0100)]
doc: Fix namespace version to 5.0.1 for qhp documentation

Change-Id: I1aa4d8dfd2f89707b1451d7b083e5b98243df9a3
Reviewed-by: hjk <qthjk@ovi.com>
4 years agoUpdate changes file for 5.0.1 release
Sergio Ahumada [Wed, 9 Jan 2013 15:23:25 +0000 (16:23 +0100)]
Update changes file for 5.0.1 release

Change-Id: I4c5b39fe0b9c8423a56c669c0ec454802e1d1963
Reviewed-by: aavit <eirik.aavitsland@digia.com>
4 years agoMerge branch 'stable' into release
Sergio Ahumada [Wed, 9 Jan 2013 08:26:16 +0000 (09:26 +0100)]
Merge branch 'stable' into release

Change-Id: Ic5a64ac86998e5a55f1b988e1b750873809e5a29

4 years agoFix glitch on MNG animation Loops when QMovie caching is enabled
Davy Durham [Fri, 4 Jan 2013 03:48:07 +0000 (21:48 -0600)]
Fix glitch on MNG animation Loops when QMovie caching is enabled

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>
4 years agoUpdate copyright year in Digia's license headers
Sergio Ahumada [Wed, 2 Jan 2013 11:44:57 +0000 (12:44 +0100)]
Update copyright year in Digia's license headers

Change-Id: I82e67b5704007d838d6ab1ee1bc9a870bff7d4c8
Reviewed-by: aavit <eirik.aavitsland@digia.com>
4 years agoAdd changes-5.0.1 file
Sergio Ahumada [Sat, 22 Dec 2012 16:01:48 +0000 (17:01 +0100)]
Add changes-5.0.1 file

Task-number: QTBUG-26065
Change-Id: I9ac06383810ab15546635fa7dda39813a069da1b
Reviewed-by: aavit <eirik.aavitsland@digia.com>
4 years agoBump Qt version to 5.0.1
Sergio Ahumada [Fri, 21 Dec 2012 23:39:23 +0000 (00:39 +0100)]
Bump Qt version to 5.0.1

Change-Id: I42f69c3f79412fef5d0c8661e7565897375add5d
Reviewed-by: aavit <eirik.aavitsland@digia.com>
4 years agoAdd qmake generated files to .gitignore.
Miikka Heikkinen [Thu, 20 Dec 2012 09:43:34 +0000 (11:43 +0200)]
Add qmake generated files to .gitignore.

Add source files generated by qmake for automatic static plugin
imports to .gitignore.

Change-Id: I8f7d72827b4fcea3811815a088012f92f4f83e38
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
4 years agopoint dependencies to 'release' branches
Sergio Ahumada [Mon, 17 Dec 2012 19:32:49 +0000 (20:32 +0100)]
point dependencies to 'release' branches

Change-Id: Ice5b28077b2d12203a8d3194497f2f312b2264db
Reviewed-by: aavit <eirik.aavitsland@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
4 years agosync.profile: Point dependencies to 'refs/heads/dev'
Sergio Ahumada [Wed, 12 Dec 2012 21:18:38 +0000 (22:18 +0100)]
sync.profile: Point dependencies to 'refs/heads/dev'

We should test dev branches against dev branches only by default.
At some point we should automate the merges from release->stable->dev
and/or decide how to handle possible conflicts.

This is good enough for the time being.

Change-Id: Ib08372b619eda3a1faf382f2fe44c3acc88f9e1f
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
5 years agoAdd PLUGIN_CLASS_NAME to qtimageformats plugins v5.0.0 v5.0.0-rc2
Miikka Heikkinen [Mon, 10 Dec 2012 12:22:10 +0000 (14:22 +0200)]
Add PLUGIN_CLASS_NAME to qtimageformats plugins

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>
5 years agoFix compilation after removal of TRUE macro
Sergio Ahumada [Thu, 6 Dec 2012 19:00:17 +0000 (20:00 +0100)]
Fix compilation after removal of TRUE macro

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>
5 years agoDoc: misc fixes v5.0.0-rc1
aavit [Tue, 4 Dec 2012 11:12:54 +0000 (12:12 +0100)]
Doc: misc fixes

Change-Id: Iaf5bada4c0ba74d1a1b869edf54bd50302ca4372
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
5 years agosync.profile: Point dependencies to 'refs/heads/stable'
Sergio Ahumada [Tue, 4 Dec 2012 10:30:03 +0000 (11:30 +0100)]
sync.profile: Point dependencies to 'refs/heads/stable'

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>
5 years agoremove symbian vestiges
Oswald Buddenhagen [Mon, 3 Dec 2012 20:37:58 +0000 (21:37 +0100)]
remove symbian vestiges

Change-Id: I1741d93a762f3d713831e2a4815eda63b9001aba
Reviewed-by: aavit <eirik.aavitsland@digia.com>
5 years agoFix: include path to Qt zlib
aavit [Sat, 1 Dec 2012 18:38:21 +0000 (19:38 +0100)]
Fix: include path to Qt zlib

Change-Id: I8142a77d45007c69bfccc0d6d471205153e2de03
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 years agotest: Mark tst_qtiff as insignificant
Sergio Ahumada [Sat, 1 Dec 2012 20:06:46 +0000 (21:06 +0100)]
test: Mark tst_qtiff as insignificant

Task-number: QTBUG-28320
Change-Id: I2cc7e01c0d7cc525ba4423006c1cc876f6b66942
Reviewed-by: aavit <eirik.aavitsland@digia.com>
5 years agoDoc: fix doc generation and add module overview (landing) page
aavit [Fri, 30 Nov 2012 13:00:14 +0000 (14:00 +0100)]
Doc: fix doc generation and add module overview (landing) page

Change-Id: I68df54cfa83a600d7fc3ada0437ffec0b14c385b
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
5 years agoUse the bundled zlib in QtCore, if present.
aavit [Wed, 28 Nov 2012 08:58:11 +0000 (09:58 +0100)]
Use the bundled zlib in QtCore, if present.

Ref. Ie986f47e00fd0c16f2ba04d27f4258a20d61b260

Change-Id: I902cd52c2f08466cf6f42cc5e1813206e2051e95
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoQImage plugins should report supported mime types
Allan Sandfeld Jensen [Mon, 26 Nov 2012 11:18:32 +0000 (12:18 +0100)]
QImage plugins should report supported mime types

Extend JSON plugin descriptions with supported MIME types.

Task-number: QTBUG-28177

Change-Id: If8e64a4a0f052718510383a74622598d741640d3
Reviewed-by: Lars Knoll <lars.knoll@digia.com>