summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-052-1/+30
|\| | | | | | | | | | | | | 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>
| * Merge remote-tracking branch 'origin/release' into stableSergio Ahumada2013-07-261-0/+25
| |\ | | | | | | | | | Change-Id: I64a312169c1234a0a26a582bde2c08bb7e9c718e
| | * Add changes-5.1.1 filev5.1.1Sergio Ahumada2013-07-231-0/+25
| | | | | | | | | | | | | | | Change-Id: Ie1c9020281ce5e0d591c0bc9393d4fe0babd6745 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | Bump MODULE_VERSION to 5.1.2Sergio Ahumada2013-07-241-1/+1
| |/ | | | | | | | | Change-Id: I59c494d5a9e95296ce403d3feb0167e8d3fd0b94 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-121-0/+4
| |\ | | | | | | | | | Change-Id: Ie3ca435442bcaab4d77fee973b82967741055628
| | * 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-0412-28/+135
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf sync.profile Change-Id: I8f788167e37c9b9ca3f4a59a9785a435eeaa6317
| * | Bump MODULE_VERSION to 5.1.1Sergio Ahumada2013-05-291-1/+1
| |/ | | | | | | | | Change-Id: I9b0c63863a4c1914f15bdbba6c02758622403ed9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * sync.profile: Point dependencies to an empty stringSergio Ahumada2013-05-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | 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>
| * Add changes-5.1.0 fileSergio Ahumada2013-05-131-0/+22
| | | | | | | | | | Change-Id: I07a808d9cf153e1cc0cfcfd2d5243b4dee8b3355 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * test: Remove insignificant_test from tst_qtiffSergio Ahumada2013-05-131-2/+0
| | | | | | | | | | | | | | | | | | 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>
| * 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>
| * disable module when gui is not availablev5.1.0-beta1Tasuku Suzuki2013-04-261-0/+2
| | | | | | | | | | Change-Id: I18b11dd3c32697e24e82ec1f04ee9bad5e424e82 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>
| * Merge branch 'release' into stableSergio Ahumada2013-04-101-0/+22
| |\ | | | | | | | | | Change-Id: I1937fdd293d96a6926749f800bcbccca7a73486d
| | * Add changes-5.0.2 filev5.0.2Sergio Ahumada2013-03-201-0/+22
| | | | | | | | | | | | | | | Change-Id: I733f11ad3879575a9390f04a4be97d86660498ea 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>
* | | Update module version to 5.2.0Sergio Ahumada2013-04-021-1/+1
| | | | | | | | | | | | | | | Change-Id: Iea133e4779c946aa144d4db3ccee2f0cdac9d3fa Reviewed-by: David Faure (KDE) <faure@kde.org>
* | | Merge branch 'stable' into devSergio Ahumada2013-04-0235-42/+1764
|\| | | | | | | | | | | Change-Id: I4890e881fd9c9b7309168157279faec2011a212f
| * | Fix the config.tests to correctly detect the 3rd party librariesAndy Shaw2013-04-022-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | 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>
| * | Bump MODULE_VERSION to 5.1.0Sergio Ahumada2013-03-251-1/+1
| | | | | | | | | | | | | | | Change-Id: Ibaf929633f97edd2211b28799957bd1a7f7a0f08 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>
* | | sync.profile: Point dependencies to 'refs/heads/dev'Sergio Ahumada2012-12-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Merge remote-tracking branch 'origin/release' into stableOswald Buddenhagen2013-03-181-0/+2
| |\| | | | | | | | | | Change-Id: I03081121451c40b7103f8d17d3a3acea370f7528
| | * define MODULE_VERSIONOswald Buddenhagen2013-02-271-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-29838 Change-Id: If5f717c32de6cbb91f09f4dd9914e1d5ff759880 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Merge branch 'stable' into releaseOswald Buddenhagen2013-02-208-16/+1681
| | |\ | | |/ | |/| | | | Change-Id: I60bd4e3d7ed8aa09c6606fb0476fa34f882cb8e3
| * | Add license files mandated by (L)GPL.Timo Jyrinki2013-02-194-0/+1660
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | 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>
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-01-182-2/+2
| |\| | | | | | | | | | Change-Id: I1dda698c407edec1309116c86584e4954da81c36
| | * 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 01:56:59 +0000