summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-245-12/+8
|\ | | | | | | | | | | | | Conflicts: src/plugins/imageformats/webp/qwebphandler.cpp Change-Id: I494e140819746c83e586bea72d8b02a7d245d970
| * remove dependencies from sync.profileOswald Buddenhagen2016-11-231-9/+1
| | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: Iec8d6adc5dc8d0c3d9f4c369d901e0352bd746f1 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * QTgaFile: fix parsing of TGA16 rgb dataMarc Mutz2016-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code tries to expand a 16-bit value of the form 0bABBBBBGGGGGRRRRR into a 32-bit QRgb, but got the operator precedence wrong: << has higher precedence than binary & This made the first operand of the |-chain (BBBBB) unconditionally zero. The second operand had the same precedence problem, but didn't decay into a tautological value like the first one did. Fix by adding another set of parentheses. The test coverage for this security-relevant piece of code is quite obviously insufficient, and should be increased, or else the format be dropped. [ChangeLog][TGA] Fixed reading of TGA-16 formats. Coverity-Id: 21782 Change-Id: I7019be8fe22e480c40192e0c1916b1d2bebf71cc Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| * QWebpHandler/QDDSHandler: init all fieldsMarc Mutz2016-11-082-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Coverity complained about uninitialised members of m_features in QWebpHandler, and m_header and m_header10 in QDDSHandler, so force value-initialization, in this case zero-initialization, by explicitly adding the fields to the ctor-init-list. Coverity-Id: 21998 Coverity-Id: 22032 Change-Id: Ie45023eda82b7034a0b3e33bab4fb23465cdc7cf Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| * Disable the DDS image format pluginGiuseppe D'Angelo2016-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As it stands right now, it's severely bugged and a security minefield (crashes). It is also pretty useless in combination with QImage: DDS files are supposed to carry multiple individual textures, texture arrays, cubemaps; mipmap chains; and may use specific texture compression formats. All these features are not supported at all by QImage. [ChangeLog][QtImageFormats] The DDS image plugin has been disabled due to lack of maintenance. Change-Id: I6e53b1b14de316389813ddd3e34a644065937b4a Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * QDDSHandler: fix Coverity warning re:swapped argumentsMarc Mutz2016-10-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Coverity was clever enough to see that the arguments to qRgba() were swapped, but too dumb to understand the comment right above. Fix the warning by explicitly swapping b and r, and then passing the arguments in the correct order. Coverity-Id: 22421 Change-Id: I87f98ea2bc8745c85fda5dbf0b03a505866ed4ae Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1Liang Qi2016-09-171-3/+7
|\| | | | | | | Change-Id: I797cc909dd28e852460554059e27d38ed91d3252
| * Doc: Clarify status of MNG, Jpeg2000 pluginsv5.6.2Topi Reinio2016-08-021-3/+7
| | | | | | | | | | | | | | | | | | | | | | While the repository still contains bundled copies of 3rd party codecs for these formats, they are not part of the build process anymore; the corresponding plugins are built only when the system libraries are found. Change-Id: Ib658b921bd08b63e68886922fc6bc45c5c3cc637 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Fix mismatched new/delete warningJake Petroules2016-08-171-1/+1
| | | | | | | | | | Change-Id: I3dabc9d3c5d84693724f3dacc68956f89c17ec9e Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-014-4/+4
|\| | | | | | | Change-Id: Ib70a7624c5047a639b6f156c2bd9a99426b9ad6c
| * Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-174-4/+4
| | | | | | | | | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: I2882f7316013471945c25167d48694b581b3b49e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * tvOS supportMike Krus2016-05-311-1/+1
| | | | | | | | | | | | | | | | | | QT_ARCH for tvOS is arm64 (not arm, since it’s 64bits only) Change-Id: Ia03d3ee07d2543a0e70ee7d77448aff9382d8fc8 (cherry picked from commit e4c1d9ece74de212ebe5c55b134de7cb23469e2d) Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | Change-Id: I74d994b030fa5c4ef3700089da9a89f14f850f2d
* | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-3/+19
|\ \ | | | | | | | | | Change-Id: Ic7cb8c5225a3497836e61cb2c3e805b4f3021606
| * | Mention license change in 5.7.0 changelog.v5.7.0Kai Koehne2016-06-081-3/+19
|/ / | | | | | | | | | | | | Change-Id: I2e2d25db863092cf50f462f3ee4864d31f879a92 Task-number: QTBUG-53913 Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1Liang Qi2016-05-191-1/+1
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia13df3c003ab6352c368fe4f3ac8342d0d686d0a
| * Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | Change-Id: I788985581d9806b8a07470e2181592f40b5dca50
| * Fix build issue with QT_USE_QTSTRINGBUILDERv5.6.1-1v5.6.1Frank Meerkoetter2016-05-101-1/+1
| | | | | | | | | | | | Change-Id: Ib10e37f32e3b83c767a6b0ef2d0ae527e2435f49 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Add changes file for 5.7Eirik Aavitsland2016-05-041-0/+24
| | | | | | | | | | Change-Id: I21e29561c995e854a58a9197a90f672efc49aeac Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Remove un-needed dependency on IOKitv5.7.0-beta1Jake Petroules2016-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | This framework is considered private on iOS, so we *can't* use it there. This amends 50e257de2642fc980d4e82fb99d455ca784f11bd. Change-Id: I6aad57540dbbf95b86bd43f265e810e67a2fb2f5 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* | Remove un-needed dependencies on Cocoa and CarbonTor Arne Vestbø2016-04-051-1/+1
| | | | | | | | | | Change-Id: I6fe96cd758ebf694cf0005d6aa46e3e8d899723e Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* | Add a Jpeg2000 handler that utilizes Apple ImageIO FrameworkEirik Aavitsland2016-03-179-6/+567
| | | | | | | | | | | | | | | | The Jasper-based jp2 plugin has been disabled by default. This plugin can replace it for OS X and iOS. Change-Id: Id43dbefdf7df22493910a855f823c9b966bafcdb Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | webp: fix linking error with system libraryEirik Aavitsland2016-03-151-2/+2
| | | | | | | | | | | | | | | | | | If using system libwebp, we now need to link with webpdemux too. That was added to the config test, but not the plugin itself. Change-Id: Ib386632570c389dfd2429de6e9f7de29d04ac472 Reviewed-by: Dayang Shen <Archangel.SDY@gmail.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | libwebp: update patches to 0.5.0 for Qt usageLiang Qi2016-03-112-6/+41
| | | | | | | | | | Change-Id: I7999f23f919ddf435fbb247371c008879adc6f42 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* | libwebp: update to 0.5.0Liang Qi2016-03-11134-7757/+21652
| | | | | | | | | | | | | | | | | | | | | | | | This commit imports libwebp 0.5.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). Change-Id: I96b4961ba63c75cc7fbab158c36a0f403f254c14 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* | Add animation support to WebP pluginDayang Shen2016-03-107-15/+227
| | | | | | | | | | | | | | | | We now use WebP Demux API to decode both single image format and muxed animation format. Change-Id: Ia2922892a3a626e9921c3910801d7c975d9fc6a2 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-078-32/+32
|\| | | | | | | Change-Id: Iaf805dab2dd057ca756e4034b9f5f55ac8bb097d
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-258-32/+32
| | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: I1970c3588d4ef3140adb655c01291e585b4f25b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-153-3/+18
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id59a8238134f1b0e172b22cd7e95d984a3f66401
| * Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-02-151-1/+4
| |\ | | | | | | | | | Change-Id: I0314084af3028bd840b1b46f35134c464de51841
| | * Merge 5.6 into 5.6.0v5.6.0-rc1v5.6.0Oswald Buddenhagen2016-02-021-1/+1
| | |\ | | | | | | | | | | | | Change-Id: I19a0c02f6cb3731d4b99d158106b6a1a29862dbb
| | * \ Merge remote-tracking branch 'origin/5.5' into 5.6.0Liang Qi2016-01-301-1/+4
| | |\ \ | | | | | | | | | | | | | | | Change-Id: Iaa0f274e35fd48dc6767a458fd0ee24c8b48e87a
| | | * | Support custom ZLIB library name(s)5.5Mike Gelfand2016-01-301-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is already the case for qtbase and qtwebkit, while here only hard-coded "zdll.lib" was used on Windows. Change-Id: I6592ed8cfc667db58cb7ab65f97f00fc83e8e7d5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * | | | Improve interpretation of undefined alpha-channelsAllan Sandfeld Jensen2016-02-112-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Libtiff does not process the alpha-channel if its definition is not specified. However to match how Qt used to save TIFF images and how tested image viewers interpret them, we need to treat unspecified alpha channels as unpremultiplied. Task-number: QTBUG-50902 Change-Id: Id72218ed5bf702b54ffa3b5b47d6230facbfa0c4 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
| * | | | Bump versionOswald Buddenhagen2016-02-081-1/+1
| | |_|/ | |/| | | | | | | | | | Change-Id: I47f7968322cf8a73ec1cb8ad0d533fe2417fbb16
* | | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-2662-1502/+3400
|\| | | | | | | | | | | | | | | Change-Id: Ieabce3c426cdd9418f5c9b18ef293b14dac23c79
| * | | Android: fix QT_CPU_FEATURES checkBogDan Vatra2016-01-251-1/+1
| |/ / | | | | | | | | | | | | | | | | | | Task-number: QTBUG-50394 Change-Id: If57e650423fcd715b8143e59958dc756f7aea023 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * | Add changes file for 5.6Eirik Aavitsland2016-01-141-0/+41
| | | | | | | | | | | | | | | Change-Id: I938c275371b4287f9da9148732505beaadbae90d Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * | Bundled libtiff updated to version 4.0.6v5.6.0-beta1Eirik Aavitsland2015-12-0939-1012/+2594
| | | | | | | | | | | | | | | | | | | | | | | | Upstream changes since 4.0.3 have been merged in. Our local tif_conf.h have been updated according to the upstream changes in tif_conf.h.in. Change-Id: I1c2aef6f0f60377de4876e25df723c32a6f95ea6 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | libwebp: update patches to 0.4.4 for Qt usageLiang Qi2015-12-081-4/+4
| | | | | | | | | | | | | | | | | | Change-Id: I995c765a0bd200f87c686a58778e94ec5e755809 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
| * | libwebp: update to 0.4.4Liang Qi2015-12-0820-485/+760
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit imports libwebp 0.4.4, 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). Change-Id: Ib12593f56553e5358548c224d1855273f3fd2318 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* | | Updated license headersJani Heikkinen2016-01-2015-242/+876
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I7e6590b69032dec27030bde39035954d64866bba Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Updated license headersJani Heikkinen2016-01-2032-417/+1769
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I6ae2887539c66fa4e1388a9486fe798f2e595434 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | tvOS supportMike Krus2015-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | QT_ARCH for tvOS is arm64 (not arm, since it’s 64bits only) Change-Id: Ia03d3ee07d2543a0e70ee7d77448aff9382d8fc8 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-0114-10/+65
|\| | | | | | | | | | | Change-Id: I37d2b2c506bcc9f4f6811b1de1a28636a6de5a2b
| * | Build MNG and Jpeg2000 plugins only if system libs foundEirik Aavitsland2015-11-253-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upstream development libmng and libjasper is mostly stalled, so security issues are dealt with by the linux distributions instead. Hence, the stale bundled copy of the 3rd party source code of those libraries can not be generally recommended. Leave the bundled versions in the repo for now as a transitional measure, so that the bundled-lib plugins still can be built manually (by doing qmake & make in the relevant src/plugins/imageformats subdirectory). In a later Qt version, the bundled copies of those libs should be removed. Change-Id: I651417d91ef0f43cb6abe638f97968576a78e2f0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
| * | Skip (pass) each autotest if the corresponding handler not presentEirik Aavitsland2015-11-259-3/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a check at initialization of each autotest, skipping it if the relevant plugin is not installed. This is the same as in the qtimagereader autotest in qtbase (SKIP_IF_UNSUPPORTED macro). Reason for change: Not all format handlers are supported on all platforms. Hence, the suite of autotests ("make check") should not fail on account of a missing plugin. Change-Id: Ic0f4da68a9527831f017db0f326afe6e631efd9e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | make use of the new QtZlib moduleOswald Buddenhagen2015-11-181-5/+1
| | | | | | | | | | | | | | | Change-Id: I5c8e220d21bf2110f8382187c55c42379f1e7873 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-10-281-0/+2
| |\| | | | | | | | | | Change-Id: Ie19ac1c5d61d14938ea9457cb9d5944931e046d2
| | * DDS: Bail out on failure to detect the format.Friedemann Kleint2015-10-201-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-48851 Change-Id: Iaf2c2b36539412a341edb721a135f36a97be4b83 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 06:24:57 +0000