summaryrefslogtreecommitdiff
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* Reapply: Fix building with clang_clAllan Sandfeld Jensen2019-07-311-3/+3
| | | | | | | | This fix was mistakenly overwritten by the recent 1.0.3 upgrade. Change-Id: Ifcfeeac075d97d770de471380c506fb739f0b52a (cherry picked from commit dbfcea2a638d9223bb8d4d9ffc63b0d294b9f97d) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update bundled libwebp to version 1.0.3André Klitzing2019-07-2246-346/+532
| | | | | | | | [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.0.3 Change-Id: I7aef89e209923af0e516024c26ebce4a8158d4d1 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Fix building with clang_clAllan Sandfeld Jensen2019-04-011-3/+3
| | | | | | | | | Clang reports itself as MSVC but doesn't allow intrinsics to be used unconditionally independent of command-line flags like MSVC does. Fixes: QTBUG-68551 Change-Id: I65d1ee1aa5c02b7c3a25c10c69c3d5e88129b858 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Update bundled libwebp to version 1.0.2André Klitzing2019-02-0421-165/+530
| | | | | | | | [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.0.2 Change-Id: I12e1557cef6e592c8c2ca417ef87f6df35a7b410 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-11135-864/+1687
|\ | | | | | | Change-Id: Ib84ba922bb21f9e6c52c3096e7ae0fc10025c202
| * Update bundled libtiff to version 4.0.10Eirik Aavitsland2018-11-1967-469/+987
| | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.0.10 Change-Id: Ib1908d09fc5847381cb03418de878fafd2001a30 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update bundled libwebp to version 1.0.1André Klitzing2018-11-1968-395/+700
| | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.0.1 Change-Id: Ieccb9f7c0023e6f6591b6093eead9f6940be3210 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Remove bundled, unmaintained libjasper source codev5.12.0-beta3Eirik Aavitsland2018-10-15118-42479/+0
| | | | | | | | | | | | | | | | | | [ChangeLog][Third-Party Code] The unmaintained bundled libjasper has been removed. Building the jp2 handler will require libjasper to be present as a system or external library. Change-Id: Ic48cc6021fc5fb64fb369eb9621fd7a811e8e9f7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-134-10/+31
|\ \ | |/ | | | | Change-Id: If9cf53dac5e906350e652e52842f3b54bc3fe65f
| * Bundled libtiff: add a number of security-related upstream patchesEirik Aavitsland2018-10-124-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This comprises the following libtiff commits, related to the listed CVEs: 3719385a3fac5cfb20b487619a5f08abbf967cf8 CVE-2017-11613 7a092f8af2568d61993a8cc2e7a35a998d7d37be CVE-2017-11613 de144fd228e4be8aa484c3caf3d814b6fa88c6d9 CVE-2018-10963 58a898cb4459055bb488ca815c23b880c242a27d CVE-2018-8905 981e43ecae83935625c86c9118c0778c942c7048 CVE-2018-10779 [ChangeLog][TIFF] A number of security-related upstream patches has been applied to the bundled libtiff Change-Id: I3def9a9b91d0dd2cfd959c5e83d972beed9394d6 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Remove bundled, unmaintained libmng source codev5.12.0-beta2Eirik Aavitsland2018-10-1277-99043/+0
|/ | | | | | | | | [ChangeLog][Third-Party Code] The unmaintained bundled libmng has been removed. Building the mng handler will require libmng to be present as a system or external library. Change-Id: I4a4805fa3f3088b5d581b92bfeabba7978bac5f7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Update bundled libwebp to version 1.0.0Liang Qi2018-05-2256-858/+1693
| | | | | | | | | | | | | | | This commit imports libwebp 1.0.0, including AUTHORS, COPYING, ChangeLog, NEWS, PATENTS, README and src directories. In src, only includes header and source files. Upstream changes since 0.6.1 have been merged in. Also updated version in qt_attribution.json. [ChangeLog][Third-Party Code] Update bundled libwebp to version 1.0.0. Change-Id: Ia30ccc90286d5dd3e48e091f101f1cae84785150 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Update the bundled libwebp to version 0.6.1v5.11.0-beta4Eirik Aavitsland2018-04-12161-5553/+7243
| | | | | | | | Upstream changes since 0.6.0 have been merged in. Also updated version in qt_attribution.json. Change-Id: I6f46bdfe2dd7288dbe61c4d7924309bb435e3928 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-4/+4
|\ | | | | | | Change-Id: Ifbf48df8a449de12d91631d44cab0320dfd5f699
| * Add fix for CVE-2017-18013 of libtiffv5.10.15.10.1André Klitzing2018-02-091-4/+4
| | | | | | | | | | | | | | | | http://bugzilla.maptools.org/show_bug.cgi?id=2770 Change-Id: I936b463b37fa922930cf122cfddf842d81ee796e Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 25d7e0440f091b39c2865187eb0630045fa20e46)
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-1514-31/+93
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: If4baad0b1949c1c8f7157c213fc492775053ae0b
| * Update bundled libtiff to version 4.0.9André Klitzing2017-11-2214-31/+93
| | | | | | | | | | | | | | [ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.0.9 Change-Id: I64a56d9b01cc1bb102a3368269ae9915fac5a051 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-2044-468/+2608
|\ \ | |/ | | | | Change-Id: If0c8e712f7521483df688ae9d33adea8b5fdaae5
| * Update bundled libtiff to version 4.0.8+Eirik Aavitsland2017-10-1944-468/+2608
| | | | | | | | | | | | | | | | | | | | | | | | | | This updates the bundled libtiff to release 4.0.8. In addition, since after that release a number of security-related fixes has been added to the upstream CVS repository, this commit comprises the upstream changes of libtiff until 2017-10-10. (Corresponds to commit 46195f7 in the unofficial mirror at github.com/vadz/libtiff.git.) [ChangeLog][Third-Party Code] Bundled libtiff was updated to version 4.0.8+ Change-Id: I9f45387ab48383ef2635d60aeda5c74828f1a6fc Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Check for not clang when checking for MSVCAllan Sandfeld Jensen2017-09-291-1/+2
|/ | | | | | Task-number: QTBUG-63512 Change-Id: I9cd97dc178c108dfca0b1ee12dd18b78497603d7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Support for Q_OS_ANDROID_EMBEDDED and android-embedded buildsOtto Ryynänen2017-04-252-3/+3
| | | | | | | | | | | | The Embedded Android build (Boot to Qt Android injection) is defined by having both Q_OS_ANDROID and Q_OS_ANDROID_EMBEDDED flags defined, as well as having Qt config android-embedded. Those flags are set in mkspecs when building for embedded Android. This commit enables the possibility to build embedded Android builds. (i.e. Qt build for Android baselayer only, without JNI) Change-Id: I8d139b6d7b61c00ad44079cbfa6e5c77e8618a7b Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Bundled libwebp updated to version 0.6.0Liang Qi2017-03-13146-6482/+14025
| | | | | | | | | | | | | | | | | This commit imports libwebp 0.6.0, including AUTHORS, COPYING, ChangeLog, NEWS, PATENTS, README and src directories. In src, only includes header and source files. Upstream changes since 0.5.1 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: I001aa7a3fabf0130b54f9005c23aa822bc1d0ec1 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-06115-2291/+5668
|\ | | | | | | Change-Id: I9cf7f04769944935d7b836453c7982839857a909
| * 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>
* | Build fix for libtiff on INTEGRITYKimmo Ollila2017-01-121-1/+1
| | | | | | | | | | | | | | | | INTEGRITY doesn't have search.h header Change-Id: I5efe7d8ced37942de85ae810e22e528996e9904f Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Nikola Velinov <nvelinov@ghs.com>
* | Build fix for libwebp on INTEGRITYKimmo Ollila2017-01-121-0/+4
|/ | | | | | | | Enabled C99 for INTEGRITY to allow non-constant values for array size Change-Id: I51978d26a9ec4798eb541dc0a03b633ac9eb426a Reviewed-by: Nikola Velinov <nvelinov@ghs.com> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@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>
* Add documentation for 3rdparty codeKai Koehne2016-09-195-0/+112
| | | | | | | | 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>
* Fix build after qtConfig changes in qtbaseLars Knoll2016-08-191-6/+2
| | | | | Change-Id: Ic2313cf8a6e938d5885aa1e26c36a5d7d5af166d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-08136-7763/+21693
|\ | | | | | | Change-Id: Idf9bbf8661a1589ff27e58322117d56363ec3e4a
| * 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>
* | Remove Windows CE.Friedemann Kleint2016-03-101-1/+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-151-1/+4
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id59a8238134f1b0e172b22cd7e95d984a3f66401
| * 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>
* | | | 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>
* | | 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>
* | Build MNG and Jpeg2000 plugins only if system libs foundEirik Aavitsland2015-11-252-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | make use of the new QtZlib moduleOswald Buddenhagen2015-11-181-5/+1
| | | | | | | | | | Change-Id: I5c8e220d21bf2110f8382187c55c42379f1e7873 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Prospective fix for build on iOSSimon Hausmann2015-07-221-0/+1
|/ | | | | | | | | Similar to commit 954fa54a88cff31a7fc869a49d17474ab1da8459 we also need to include the header that provides the jas_eprintf function declaration. Change-Id: I5f1e2e44bccf960ac88a21847e796e4548fcc4be Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Android: Build webp pluginEskil Abrahamsen Blomfeldt2015-05-201-4/+31
| | | | | | | | | | | | | | | | We need to include the cpufeatures module in the build for Android, and we need to make sure the neon files are compiled with neon flags turned on. Since these are .c files, we cannot use the regular simd.prf approach, which only supports .cpp, so the compiler is basically copy-pasted from simd.prf, but using QMAKE_CC instead of QMAKE_CXX. [ChangeLog][Android] Added support for webp image format. Change-Id: Id702b8202bee963d23beb02a7dc163756c8ca712 Task-number: QTBUG-38715 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* Remove more extraneous files from bundled libtiffEirik Aavitsland2015-04-09142-29895/+0
| | | | | | | They are HOWTO-RELEASE, SConstruct, nmake.opt and html sub directory. Change-Id: If7d3aad3a353caa14239b1faf0af8b9cd393bcf7 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* libwebp: update patches to 0.4.3 for Qt usageLiang Qi2015-04-092-13/+61
| | | | | | Change-Id: I1b333671e778824cc29b9c2125121fc7f1889b4d Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
View Lorry Controller Status