summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-01-29Bump package version to 5.2.2submit/tizen_ivi_release/20140312.071347submit/tizen/20140312.070916submit/tizen/20140226.110235submit/tizen/20140129.131043accepted/tizen/mobile/20140227.072134accepted/tizen/ivi/release/20140312.121221accepted/tizen/ivi/panda/20140312.114335accepted/tizen/ivi/20140226.205210accepted/tizen/ivi/20140129.180950accepted/tizen/generic/20140312.122317accepted/tizen/generic/20140226.134707accepted/tizen/generic/20140129.142523tizen_ivi_releaseaccepted/tizen_ivi_releaseaccepted/tizen/iviaccepted/tizen/genericTomasz Olszak1-1/+1
Tizen-Bug: TIVI-2416 Change-Id: If3b176110ecd3e0af06e5eee5811644b4a7a0420 Signed-off-by: Tomasz Olszak <olszak.tomasz@gmail.com>
2014-01-29Bump package version to 5.2.1Tomasz Olszak1-1/+1
Change-Id: I6146c8339d27336abfabaa2c81d6fb67a5322782
2014-01-29spec adapted for TizenTomasz Olszak2-86/+121
2014-01-29Import from MerTomasz Olszak1-0/+86
2014-01-16Bump MODULE_VERSION to 5.2.2upstream/5.2.2Sergio Ahumada1-1/+1
Change-Id: Ibafe0f44c0235517bf8b7ac85f4baa2d3a728f34 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-11-25Bump MODULE_VERSION to 5.2.1upstream/5.2.1Sergio Ahumada1-1/+1
Change-Id: I979cdf4dd3f1a8d2e3b73c9fce8507a4ce97198d Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-11-25Recognize newer libmng versions in config testaavit1-0/+2
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>
2013-11-06Doc: Updated url variable in qdocconf files.Jerome Pasion1-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>
2013-10-07Fixes windows ce buildBjoern Breitmeyer3-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>
2013-08-14Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn1-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
2013-08-05Make libtiff link on OS X 10.9Gabriel de Dietrich1-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>
2013-08-05Merge branch 'stable' into devSergio Ahumada2-1/+30
Conflicts: .qmake.conf Change-Id: Ib841f2c7f6c0819ff9b41a11249331ca585d6d60
2013-07-30fix shadow build with -qt-zlib and pre-generated headersOswald Buddenhagen1-1/+5
Task-number: QTBUG-32641 Change-Id: I4d0b4df50b652cf47e5f0b75b6d3c1f714414007 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-07-26Merge remote-tracking branch 'origin/release' into stableSergio Ahumada1-0/+25
Change-Id: I64a312169c1234a0a26a582bde2c08bb7e9c718e
2013-07-24Bump MODULE_VERSION to 5.1.2Sergio Ahumada1-1/+1
Change-Id: I59c494d5a9e95296ce403d3feb0167e8d3fd0b94 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-07-23Add changes-5.1.1 fileSergio Ahumada1-0/+25
Change-Id: Ie1c9020281ce5e0d591c0bc9393d4fe0babd6745 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-06-26Doc: Setting navigation variablesJerome Pasion1-1/+3
-for the navigation bar Change-Id: If918610d2f80bf1bafffcef13851dc9f47aba8fd Reviewed-by: Martin Smith <martin.smith@digia.com>
2013-06-12Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn1-0/+4
Change-Id: I70792d10fb83d92b3b60e64b89c4dbf8144ccba5
2013-06-12Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn1-0/+4
Change-Id: Ie3ca435442bcaab4d77fee973b82967741055628
2013-06-04Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn12-28/+135
Conflicts: .qmake.conf sync.profile Change-Id: I8f788167e37c9b9ca3f4a59a9785a435eeaa6317
2013-06-04Doc: Made "Qt Image Formats" entry in Assistant/Creator childless.Jerome Pasion1-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>
2013-05-29Bump MODULE_VERSION to 5.1.1Sergio Ahumada1-1/+1
Change-Id: I9b0c63863a4c1914f15bdbba6c02758622403ed9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-25sync.profile: Point dependencies to an empty stringSergio Ahumada1-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>
2013-05-13Add changes-5.1.0 fileSergio Ahumada1-0/+22
Change-Id: I07a808d9cf153e1cc0cfcfd2d5243b4dee8b3355 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-13test: Remove insignificant_test from tst_qtiffSergio Ahumada1-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>
2013-05-13TGA-Reader: Bail out of check if the device is not seekable.Friedemann Kleint1-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>
2013-04-26disable module when gui is not availableTasuku Suzuki1-0/+2
Change-Id: I18b11dd3c32697e24e82ec1f04ee9bad5e424e82 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-04-25Doc: Fix module name in .qdocconfTopi Reinio1-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>
2013-04-18Fix MNG imageformat plugin build.Janne Anttila2-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>
2013-04-12Fix tiff imageformat plugin build for WEC7.Janne Anttila3-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>
2013-04-10Merge branch 'release' into stableSergio Ahumada1-0/+22
Change-Id: I1937fdd293d96a6926749f800bcbccca7a73486d
2013-04-05Upgrading libtiff: Patches to libtiff 4.0.3 for Qt usageLiang Qi2-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>
2013-04-05Upgrading libtiff: Adding clean copy of libtiff 4.0.3Liang Qi159-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>
2013-04-02Update module version to 5.2.0Sergio Ahumada1-1/+1
Change-Id: Iea133e4779c946aa144d4db3ccee2f0cdac9d3fa Reviewed-by: David Faure (KDE) <faure@kde.org>
2013-04-02Merge branch 'stable' into devSergio Ahumada35-42/+1764
Change-Id: I4890e881fd9c9b7309168157279faec2011a212f
2013-04-02Fix the config.tests to correctly detect the 3rd party librariesAndy Shaw2-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>
2013-03-27Fix compilation for Android.BogDan Vatra2-1/+2
Change-Id: Ide46bb5104022c5e54a1f2a8bd7822a14bcf603d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-03-25Bump MODULE_VERSION to 5.1.0Sergio Ahumada1-1/+1
Change-Id: Ibaf929633f97edd2211b28799957bd1a7f7a0f08 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-03-20Add changes-5.0.2 fileSergio Ahumada1-0/+22
Change-Id: I733f11ad3879575a9390f04a4be97d86660498ea Reviewed-by: aavit <eirik.aavitsland@digia.com>
2013-03-19Merge branch 'dev' into stableSergio Ahumada1-0/+8
This starts Qt 5.1 release cycle Change-Id: I2fc10bd848450dd3102e8525ba226ce3aa027cdd
2013-03-18Merge remote-tracking branch 'origin/release' into stableOswald Buddenhagen1-0/+2
Change-Id: I03081121451c40b7103f8d17d3a3acea370f7528
2013-02-27define MODULE_VERSIONOswald Buddenhagen1-0/+2
Task-number: QTBUG-29838 Change-Id: If5f717c32de6cbb91f09f4dd9914e1d5ff759880 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-02-20Merge branch 'stable' into releaseOswald Buddenhagen8-16/+1681
Change-Id: I60bd4e3d7ed8aa09c6606fb0476fa34f882cb8e3
2013-02-19Add license files mandated by (L)GPL.Timo Jyrinki4-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>
2013-02-06Fix spelling errors in QTgaFile messages.Friedemann Kleint1-2/+2
Change-Id: I967f20698d161a52365c9bfea68ca0c7596b998b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-05Fix TIFFTAG_RESOLUTIONUNIT handling.Leonard Lee1-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>
2013-02-05Use QTgaFile as translation context.Friedemann Kleint2-10/+13
Change-Id: I2042a031a3618a361cf3f98628978d3f2581baed Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-01fix doc page urlsOswald Buddenhagen1-1/+1
they are versioned nowadays Change-Id: I995432d9892e9f0444b7c01f04e264aa00aeab55 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-02-01substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen1-2/+2
Change-Id: I1a61c89695b28e64000c82156bfbe0f22a45be7f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-01-18Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2-2/+2
Change-Id: I1dda698c407edec1309116c86584e4954da81c36
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 17:53:34 +0000