| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| | |
Change-Id: I07a808d9cf153e1cc0cfcfd2d5243b4dee8b3355
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| | |
Change-Id: I18b11dd3c32697e24e82ec1f04ee9bad5e424e82
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |\
| | |
| | |
| | | |
Change-Id: I1937fdd293d96a6926749f800bcbccca7a73486d
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I733f11ad3879575a9390f04a4be97d86660498ea
Reviewed-by: aavit <eirik.aavitsland@digia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Iea133e4779c946aa144d4db3ccee2f0cdac9d3fa
Reviewed-by: David Faure (KDE) <faure@kde.org>
|
|\ \ \
| |/ /
| | |
| | | |
Change-Id: I4890e881fd9c9b7309168157279faec2011a212f
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ide46bb5104022c5e54a1f2a8bd7822a14bcf603d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: Ibaf929633f97edd2211b28799957bd1a7f7a0f08
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
| |\ \
| |/ /
|/| |
| | |
| | |
| | | |
This starts Qt 5.1 release cycle
Change-Id: I2fc10bd848450dd3102e8525ba226ce3aa027cdd
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| |\ \
| | |/
| | |
| | | |
Change-Id: I03081121451c40b7103f8d17d3a3acea370f7528
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-29838
Change-Id: If5f717c32de6cbb91f09f4dd9914e1d5ff759880
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
| | |\
| | |/
| |/|
| | | |
Change-Id: I60bd4e3d7ed8aa09c6606fb0476fa34f882cb8e3
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I967f20698d161a52365c9bfea68ca0c7596b998b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I2042a031a3618a361cf3f98628978d3f2581baed
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
they are versioned nowadays
Change-Id: I995432d9892e9f0444b7c01f04e264aa00aeab55
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I1a61c89695b28e64000c82156bfbe0f22a45be7f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
|
| |\ \
| | |/
| | |
| | | |
Change-Id: I1dda698c407edec1309116c86584e4954da81c36
|
| |/
| |
| |
| |
| | |
Change-Id: I1aa4d8dfd2f89707b1451d7b083e5b98243df9a3
Reviewed-by: hjk <qthjk@ovi.com>
|
| |
| |
| |
| |
| | |
Change-Id: I4c5b39fe0b9c8423a56c669c0ec454802e1d1963
Reviewed-by: aavit <eirik.aavitsland@digia.com>
|
| |\
| | |
| | |
| | | |
Change-Id: Ic5a64ac86998e5a55f1b988e1b750873809e5a29
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I82e67b5704007d838d6ab1ee1bc9a870bff7d4c8
Reviewed-by: aavit <eirik.aavitsland@digia.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-26065
Change-Id: I9ac06383810ab15546635fa7dda39813a069da1b
Reviewed-by: aavit <eirik.aavitsland@digia.com>
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I42f69c3f79412fef5d0c8661e7565897375add5d
Reviewed-by: aavit <eirik.aavitsland@digia.com>
|
| |/
|/|
| |
| |
| |
| |
| |
| | |
Add source files generated by qmake for automatic static plugin
imports to .gitignore.
Change-Id: I8f7d72827b4fcea3811815a088012f92f4f83e38
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|/
|
|
|
|
| |
Change-Id: Ice5b28077b2d12203a8d3194497f2f312b2264db
Reviewed-by: aavit <eirik.aavitsland@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: Iaf5bada4c0ba74d1a1b869edf54bd50302ca4372
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
| |
Change-Id: I1741d93a762f3d713831e2a4815eda63b9001aba
Reviewed-by: aavit <eirik.aavitsland@digia.com>
|
|
|
|
|
| |
Change-Id: I8142a77d45007c69bfccc0d6d471205153e2de03
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
| |
Task-number: QTBUG-28320
Change-Id: I2cc7e01c0d7cc525ba4423006c1cc876f6b66942
Reviewed-by: aavit <eirik.aavitsland@digia.com>
|
|
|
|
|
| |
Change-Id: I68df54cfa83a600d7fc3ada0437ffec0b14c385b
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
|
|
|
|
|
|
|
| |
Ref. Ie986f47e00fd0c16f2ba04d27f4258a20d61b260
Change-Id: I902cd52c2f08466cf6f42cc5e1813206e2051e95
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
|
|
|
|
|
|
|
|
|
| |
Extend JSON plugin descriptions with supported MIME types.
Task-number: QTBUG-28177
Change-Id: If8e64a4a0f052718510383a74622598d741640d3
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
| |
Change-Id: I3cf89ce6dae4076b2776026957db13f3aee9ec8f
Reviewed-by: aavit <eirik.aavitsland@digia.com>
|
|
|
|
|
| |
Change-Id: Ie0423b313d12a2b19db4f7ed4b63ce19f53b21d4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|