| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| | |
Change-Id: I24a848a9789ef3e094522b0966a5d266ce06fecd
|
| |
| |
| |
| |
| | |
Change-Id: I733f11ad3879575a9390f04a4be97d86660498ea
Reviewed-by: aavit <eirik.aavitsland@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>
|
|
|
|
|
|
|
|
| |
DESTDIR and INSTALLS+=target are set up automatically now, but
PLUGIN_TYPE needs to be defined.
Change-Id: I5dd40f4fb6bfc6723ed96241f41301b32393dd34
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
| |
Change-Id: Id7ade8a50ef0e91a6a0e5aa949a45b806deca769
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
| |
Change-Id: Ia1a5cbe98eaeca91121f0fbd394419f8ff1c82f7
Reviewed-by: Martin Smith <martin.smith@digia.com>
|
|
|
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: Ia126f46d5f67e9acf9e2efc8bf99c50fd1c22809
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
| |
These templates must be included in the qdocconf files.
Task-number: QTBUG-27293
Change-Id: Ie912cae404951f0102e0264d462d786025f388d0
Reviewed-by: Martin Smith <martin.smith@digia.com>
|
|
|
|
|
|
|
|
| |
Without the double quotes, the apostrophe is considered an unmatched
single quote by the pro file parser.
Change-Id: Ibd1b38e2b714b0a99baf95c4e69fe87a0a962630
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The .gitattributes and .gitignore files do not need to be present in
packaged sources, as they are for people using the Git repository.
People who download tarballs usually don't reimport into Git -- they
should just download the actual repositories.
Meanwhile, the .tag file is quite useful. Instead of making Git extract
to the useless SHA-1 of the $n string, ask git-archive to store
the SHA-1 of the commit being packaged.
Change-Id: I0c93d28c4a96d4479f141c18f3234e5252be6d7c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
| |
Use QMAKE_DOCS instead, if the module has docs in the future.
Change-Id: I839391f1e19d24ed162840fa9932dd2b50b68151
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
|
|
|
|
|
|
|
| |
there are no qt modules here, so these lines will never be used
Change-Id: I85930c993a8befc9607dc1f792074da42334e0ad
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The current code didn't run the tests anymore, but was still
based on the assumption that qtbase/configure set up the
right configuration.
Clean up the pro files for mng and tiff while we're at it.
Change-Id: Iee46c183fda57ec07b60a80089af7925db959c40
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
| |
Change-Id: I2de2ac4d37ab6b9eda0dfbb2802671a62120d405
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
|
|
|
| |
re-enabling them would not work anymore anyway
Change-Id: Iea3c7e4691ce7e43e6aeed8db7f41664d170810e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
| |
Change-Id: I22368f64dcb046b2d0a0296ff506be4a02acd887
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
|
|
|
|
| |
Change-Id: I8f3054dbfb576a68c241d56b64efd17b3fa421f8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
|
|
|
|
|
| |
Change-Id: I3f38e242e0519bffd297a9073a65875946beed05
Reviewed-by: aavit <qt_aavit@ovi.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This is a port to Qt 5/qtimageformats of the contribution
https://qt.gitorious.org/qt/qt/merge_requests/1117
by
Dmitry Zelenkovskiy <Dmitry.Zelenkovskiy@nokia.com>
Change-Id: I9cdd249d3c58c5f922ccd2d43f92f1bd2e3fd86f
Reviewed-by: Jason Barron <jason.barron@nokia.com>
Reviewed-by: aavit <qt_aavit@ovi.com>
|
|
|
|
|
| |
Change-Id: Ib1d37b12d35db19f3b12d1881d29d3e0154d414d
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Rev-By: Samuel Rodal
Fix-for: QTBUG-21955
Part of fix for https://bugreports.qt.nokia.com/browse/QTBUG-21955
Having tga plugin inside a Qt add-on causes packaging problems.
There have been many queries over the years for tga support even tho it
is a niche image format. It is particularly useful for OpenGL work as a
texture format since it is a blittable bitmap, but it is very
innefficient compared to png or jpg.
For this reason only read support is added, and this is documented.
Also add one unit test.
(based on cherry picked from Qt 4.8 commit 951a997893407b0a26f21fe0acec4701fa3d4279)
Adds code removed from Qt3D.
http://codereview.qt-project.org/#change,13898
Conflicts:
tests/auto/qimagereader/qimagereader.pro
tests/auto/qimagereader/tst_qimagereader.cpp
Change-Id: Ia1b7420dd3461cb1d2f1d857d11444a0a533de43
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
|