summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix include order5.8Ulf Hermann2017-03-061-2/+2
| | | | | | | | | We need to include qimageiohandler.h if we want to be sure that we can use it. Also, QT_NO_IMAGEFORMATPLUGIN is defined in a header and needs to be checked after the includes. Change-Id: Ic6c376c87abb9684f45ca3d740deb7e580220ae4 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-26115-2291/+5668
|\ | | | | | | Change-Id: I8a8151eb2dd01059cf86da8f72ecb65612bff0c1
| * Bundled libtiff updated to version 4.0.7v5.8.0-rc1v5.8.05.8.0Liang Qi2016-12-1343-567/+1503
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit imports libtiff 4.0.7, including COPYRIGHT, ChangeLog, README, README.vms, RELEASE-DATE, TODO, VERSION and libtiff, port directories. In libtiff, only includes SConstruct, libtiff.def, libtiff.map, libtiffxx.map, tif_config.h-vms, header and source files. In port, only includes header and source files. Upstream changes since 4.0.6 have been merged in, includes 701ba023 and 52dd6b1e. Also updated version in qt_attribution.json. Conflicts: src/3rdparty/libtiff/libtiff/tif_win32.c src/3rdparty/libtiff/libtiff/tiffiop.h src/3rdparty/libtiff/port/strtoull.c src/3rdparty/libtiff/qt_attribution.json Change-Id: I7a7a55676c007fd2b3eeff2b2e3ca481eb5724d9 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
| * Bundled libwebp updated to version 0.5.1Liang Qi2016-12-1372-1724/+4165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit imports libwebp 0.5.1, including AUTHORS, COPYING, ChangeLog, NEWS, PATENTS, README and src directories. In src, only includes header and source files. Upstream changes since 0.5.0 have been merged in. Also updated version in qt_attribution.json. Conflicts: src/3rdparty/libwebp.pri src/3rdparty/libwebp/qt_attribution.json src/3rdparty/libwebp/src/webp/config.h Change-Id: I7d0c15400154c3b4ee8ff37665303307c4b84f9f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | QWbmpHandler: fix integer overflowMarc Mutz2017-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | Both 'hdr.height' and 'hdr.width' are quint32s. Multiplying them still gives a quint32, but the lhs expected a qint64. Fix by casting one of the operands to qint64. Coverity-Id: 22179 Change-Id: If7385fb42bf994d87ac4e603fa85be4a30ad6d5c Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | QTgaFile: fix Coverity warning re:mixing enum typesMarc Mutz2017-01-051-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Coverity complained that the 'bytes' variable was first compared to a QTgaFile::HeaderOffset, then, later, to a QTgaFile::FooterOffset. This is of course a false positive, but one that's trivial to fix, by not using a variable in the first place. Adjust to Qt coding standard as a drive-by. Coverity-Id: 22048 Change-Id: If1a45aa5b0c8ea23cab2cefeccb2f1dfe5f03375 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Remove unused former overridersAlexander Volkov2016-12-056-36/+0
| | | | | | | | | | | | | | | | QImageIOPlugin::keys() was removed in Qt 5.0 by c9d040c1f5b0ee0ddd37e924576ec3bbd990f2ed in qtbase. Change-Id: Ifda96e4764aa82d6f608d9ee2e29bac554603705 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Add missing override and remove redundant virtualAlexander Volkov2016-12-0518-85/+85
| | | | | | | | | | Change-Id: I12f79f8fecdd03e4e6d4ce76e49d3c2d91003676 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Replace Q_DECL_OVERRIDE by overrideAlexander Volkov2016-12-052-14/+14
|/ | | | | | | The 'override' specifier can be used directly since Qt 5.7. Change-Id: I673d4a3028132318dc5e686100476a8758984f0d Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-266-7/+15
|\ | | | | | | Change-Id: I6c1caae4b071cac4caf88bf85582a2a76a1ccd2b
| * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-244-3/+7
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/imageformats/webp/qwebphandler.cpp Change-Id: I494e140819746c83e586bea72d8b02a7d245d970
| | * 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.15.7.1Liang Qi2016-09-171-3/+7
| |\ \ | | |/ | | | | | | Change-Id: I797cc909dd28e852460554059e27d38ed91d3252
| | * Doc: Clarify status of MNG, Jpeg2000 pluginsv5.6.25.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>
| | * 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>
| * | Fix mismatched new/delete warningJake Petroules2016-08-171-1/+1
| | | | | | | | | | | | | | | Change-Id: I3dabc9d3c5d84693724f3dacc68956f89c17ec9e Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* | | libtiff: Replace BSD advertising clauseKai Koehne2016-10-271-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | Replace strtoull.c from libtiff with version in qtbase that has an updated license without advertising clause. Change-Id: I3ffdb8799adc6ef18c60021d2d2fe222df1c2acd Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | remove spurious platformsupport dependencyv5.8.0-beta1Oswald Buddenhagen2016-10-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's not quite clear why it was included. however, it pulled in CoreGraphics transitively, which now has to be done explicitly. Change-Id: I4186f0603360645d81895d850005af01966834c5 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | | Add documentation for 3rdparty codeKai Koehne2016-09-196-0/+125
| | | | | | | | | | | | | | | | | | | | | | | | Use new licensescanner / qt_attribution.json file infrastructure to generate documentation about 3rdparty licenses. Change-Id: Ic81d8c33be094e51b6e4ca0f35074136170f491b Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | | Link to CoreFoundation in macjp2 pluginv5.8.0-alpha1Jake Petroules2016-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This fixes a linking error on tvOS (though strangely not macOS). Change-Id: I1f339fefa07ab55bc943aabf895f713e8ef6f6c1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | | Fix build after qtConfig changes in qtbaseLars Knoll2016-08-191-6/+2
| | | | | | | | | | | | | | | Change-Id: Ic2313cf8a6e938d5885aa1e26c36a5d7d5af166d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | Use LZW compression on 1- and 8-bit formatsAllan Sandfeld Jensen2016-06-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation says we use LZW, and LZW both works and produces smaller results, so it would make sense to follow our documentation. This also fixes a problem with some readers having trouble with the CCITTRLE compressions. Task-number: QTBUG-53774 Change-Id: Ie2d179279a4ce65d8578c037ad59cc37ca854825 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-242-2/+2
|\ \ \ | |/ / | | | | | | Change-Id: I903a1827c6680339a12a4ad9edf30f7d99c2a542
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1Liang Qi2016-05-191-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia13df3c003ab6352c368fe4f3ac8342d0d686d0a
| | * Fix build issue with QT_USE_QTSTRINGBUILDERv5.6.1-1v5.6.15.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>
| * | 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>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-08154-7814/+22453
|\ \ \ | |/ / | | | | | | Change-Id: Idf9bbf8661a1589ff27e58322117d56363ec3e4a
| * | 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-178-4/+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-102-13/+159
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Remove Windows CE.Friedemann Kleint2016-03-105-76/+0
|/ / | | | | | | | | | | | | | | | | Remove #ifdef sections for Q_OS_WINCE, wince .pro file clauses and the CE-specific file qfunctions_wince.cpp. Task-number: QTBUG-51673 Change-Id: I839d6fa07e1929da2e2f2115bfc8aa670b3a117f Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-152-3/+17
|\ \ | |/ | | | | | | | | | | 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.05.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-111-2/+13
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-2661-1502/+3359
|\ \ \ \ | |/ / / | | | | | | | | 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>
| * | 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>
View Lorry Controller Status