summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* SQLite: Update SQLite to v3.41.2Christian Ehrlicher2023-04-253-36/+74
| | | | | | | | | | [ChangeLog][Third-Party Code] Updated SQLite to v3.41.2 Change-Id: I9e36e54e0d85368f505565b51f45eed8c30d140e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Köhne <kai.koehne@qt.io> (cherry picked from commit b46a914bd73a50202e0475f6edbb847457287b5c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* SQLite: Update SQLite to v3.41.1Christian Ehrlicher2023-03-173-39/+92
| | | | | | | | | [ChangeLog][QtSQL][SQLite] Updated SQLite to v3.41.1 Change-Id: Ibc88ae7b73ea46797d7aff00ee193b1ccfaae31b Reviewed-by: Andy Shaw <andy.shaw@qt.io> (cherry picked from commit 17e4b2d8ed8fc6c05e9ce66d39f0eff5a768cbd6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix listed files for sha3_keccakKai Köhne2023-03-131-1/+1
| | | | | | | | | | | | JSON allows duplicated fields, but the last one will prevail. Therefore move the new "comment" before the actual list of files. Amends fa4b7495b741c3e7943860c5ff15212afceda710. Change-Id: I06874745c8c51e55d79d7a373236cc8d9151079d Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit d4dba80863324302f9d5d26b184352845263adc3) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix overflow in SHA-3/KeccakMårten Nordheim2023-03-133-2/+35
| | | | | | | | | | | | | state->rate is always larger than or equal to state->bitsInQueue; when bitsInQueue == rate the queue is consumed and bitsInQueue is set to 0 again. Done-with: Marc Mutz <marc.mutz@qt.io> Change-Id: I56d268a19fb3cd542cc027edc962253f09d97a14 Reviewed-by: Marc Mutz <marc.mutz@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit fa4b7495b741c3e7943860c5ff15212afceda710) Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update to Freetype 2.13.0Eskil Abrahamsen Blomfeldt2023-03-07515-7722/+6158
| | | | | | | | | | | Also adds a file to patches which is a required modification to the update in order to make it compile. Fixes: QTBUG-111536 Change-Id: Iaabc1b7736cfd98217a8aff2b7f9bc65402d0451 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 18aa3309a4e4b5a874298af1243095db9aa207d3)
* SQLite: Update SQLite to v3.41.0Andy Shaw2023-03-013-1354/+2979
| | | | | | | | | | [ChangeLog][QtSQL][SQLite] Updated SQLite to v3.41.0 Fixes: QTBUG-111539 Change-Id: Ia90939bf57222a290fe7bcb3741013c2576eec13 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 8f33a0424f5799a87d6d56691f3e47a09156c720) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update bundled libjpeg-turbo to version 2.1.5Eirik Aavitsland2023-02-1321-86/+165
| | | | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.1.5 Task-number: QTBUG-110336 Change-Id: Ifc08ad7f1a3c5b3e66b11e5a51d523b091288790 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 94efcf9be4c5e46dff463806e278fcee90ff4d53) Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* forkfd/linux: add support for LoongArchWANG Xuerui2023-01-301-1/+2
| | | | | | | | | | | This architecture is not CLONE_BACKWARDS in any way. Matching OpenDCDiag PR: https://github.com/opendcdiag/opendcdiag/pull/169 Change-Id: Ibceccfd20d270b30302a936885d12e4c55cdd833 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 0ab51dcc3c0cca0d84822f3871d98ffa46b6b2e4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* SQLite: Update SQLite to v3.40.1Andy Shaw2023-01-063-48/+151
| | | | | | | | | [ChangeLog][QtSQL][SQLite] Updated SQLite to v3.40.1 Change-Id: Ic17019f65083b24238025fe6ea6ee9872ac783fe Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> (cherry picked from commit cac325fdc11a409473bd13a758de608eb3df1540) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* SQLite: Update SQLite to v3.40.0Andy Shaw2022-12-163-1587/+3539
| | | | | | | | | [ChangeLog][QtSQL][SQLite] Updated SQLite to v3.40.0 Change-Id: I7beb0bc9c1256f273d6011567c5ef3975ada5060 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> (cherry picked from commit eac9f395175d7a80603ccf7ca9b431f1a4c7932f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PCRE2: upgrade to 10.42Giuseppe D'Angelo2022-12-1336-3496/+9919
| | | | | | | | | | | Upstream released 10.41 and 10.42 in quick succession. [ChangeLog][Third-Party Code] PCRE2 has been updated to 10.42. Change-Id: Iadec8e64e9ce7ddad17afb075157719af76379bd Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 05e72d53a6b0546d67dc699f922811790a896fb3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update bundled libpng to version 1.6.39Eirik Aavitsland2022-11-2815-117/+136
| | | | | | | | | [ChangeLog][Third-Party Code] libpng was updated to version 1.6.39 Change-Id: I0113fb071d344049976953253adb4d898a1bb7c6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit f6fefbc6caf2d7a8ab0b965626905efc1a32c397) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update bundled zlib to version 1.2.13Dennis Oberst2022-11-1822-310/+284
| | | | | | | | | | | | | zlib 1.2.13 has been available since October 13, 2022. Also fixes CVE-2022-37434. [ChangeLog][Third-Party Code] zlib was updated to version 1.2.13. Fixes: QTBUG-108130 Change-Id: Iaa2a9486f1cbbcd6a23d48df632e01bc05b414d5 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit f678893f8acd00bd0caca5101858e2a9fdf96a5c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update bundled libpng to version 1.6.38Eirik Aavitsland2022-10-1921-259/+176
| | | | | | | | | | | | | | | | | | | With this update, there are no longer any diffs to upstream libpng. Hence, the qtpatches.diff file is removed. Details: - #define _CRT_SECURE_NO_DEPRECATE: Done on compiler cmdline instead - #undef PNG_BUILD_DLL: For our usecase, that only caused PNG_IMPEXP to be defined to an empty string. Done on compiler cmdline instead. - #ifdef for WinCE: dead platform. - #ifdef for WinRT: No longer needed, upstream does what we want - A memory leak fix: Included in upstream 1.6.38. [ChangeLog][Third-Party Code] libpng was updated to version 1.6.38 Change-Id: I229db30e1dd54c209dc93e76d11e6fdb1f7adbdb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 2742ceb1cd9b1a383049ac41970bc06e8955c8df) Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* forkfd: fix Clang 15 ATOMIC_VAR_INIT deprecation warningMarc Mutz2022-10-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Replace the macro use with the expansion of the macro as it appears in both libc++ as well as libstdc++. Fixes Clang 15 C++20 warning-turned-error: forkfd.c:157:39: error: macro 'ATOMIC_VAR_INIT' has been marked as deprecated [-Werror,-Wdeprecated-pragma] static ffd_atomic_int forkfd_status = FFD_ATOMIC_INIT(0); ^ forkfd_c11.h:51:37: note: expanded from macro 'FFD_ATOMIC_INIT' #define FFD_ATOMIC_INIT(val) ATOMIC_VAR_INIT(val) ^ /d/llvm/15/bin/../include/c++/v1/atomic:2671:43: note: macro marked 'deprecated' here # pragma clang deprecated(ATOMIC_VAR_INIT) ^ Matching OpenDCDiag pull request: https://github.com/opendcdiag/opendcdiag/pull/159 Change-Id: I0204f7fcd6039624ed75d414daf9b6a771bfd9d0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 35649760e5ec22b4dcea0729ad679f51f438573d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update bundled libjpeg-turbo to version 2.1.4Eirik Aavitsland2022-09-099-16/+75
| | | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.1.4 Change-Id: Iaffb12606ec53c3ee217b51ad20663aa4409eafa Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit e6d3657f7f90a6a184b391d74a9542ef0acf072c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 3rdparty: apply a fix to the last zlib fixThiago Macieira2022-09-092-2/+35
| | | | | | | | | | Source: https://github.com/madler/zlib/commit/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Change-Id: Ic6547f8247454b47baa8fffd17111732eb074b0a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit d6fae59faa49cedf44960f54b43cb80c6a751a15) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update zconf.h prefixes to match zlib v1.2.12 updateChristian Heimlich2022-09-032-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | Historically Qt has used `Z_PREFIX` within zconf.h of its bundled zlib copy to prefix all zlib symbols with `z_` in order to prevent clashes with a potential system install of the library when linking statically; however, v1.2.12 introduced 3 new functions that were erroneously not accounted for in the upstream repository: - crc32_combine_gen - crc32_combine_gen64 - crc32_combine_op `403020` updated our bundled zlib to this new version and therefore Qt has inherited this oversight, now clashing with external zlib builds. Manually add prefix macro definitions for these three symbols to restore built-in zlib to its previous clash free state while waiting for the issue to be addressed upstream. Change-Id: I83f88109a08cf7e7117f1c94b4557a2c36f519c3 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 54ea62756a7b0d47370551b0ec07f602cb341228) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* 3rdparty/zlib: backport the fix to CVE-2022-37434Thiago Macieira2022-08-302-2/+38
| | | | | | | | | Qt isn't known to be affected by this. Change-Id: Ic6547f8247454b47baa8fffd171025f5a435a209 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit ab3342c26f4b7926b1c210df4dd254962b170da1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* SQLite: Update SQLite to v3.39.2Andy Shaw2022-08-043-5775/+10259
| | | | | | | | | | [ChangeLog][QtSQL][SQLite] Updated SQLite to v3.39.2 Fixes: QTBUG-103675 Change-Id: Ic75ffacc53cf17c08e328921dcc0f7abe09ed1ac Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit 41c4f9a47ad8fdd3d7ee645b6fa821ad416b2b43) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update freetype to 2.12.1Volker Hilsheimer2022-07-28512-6100/+35493
| | | | | | | | | | | | | | | ftdebug.c files are new, adapted the import script to copy the source file for Windows as well. Updated the .pro file for 5.15, adding those source files that define symbols that were reported as unresolved when building. Fixes: QTBUG-105032 Change-Id: I1e846167b268df4b1b0a50dcec602def1a0bdcb4 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit e79d7f12e6ca15c499a553e4a701a2887e4b184c) Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Upgrade PCRE2 to 10.40Giuseppe D'Angelo2022-05-2647-9258/+13827
| | | | | | | | | | | | | New upstream release. [ChangeLog][Third-Party Code] PCRE2 has been updated to 10.40. Change-Id: Ice0516604259ad9fd36fe2708aa0239aafe381ca Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 86321a0debe2961f134a815c8f2ae82b075cc014) Reviewed-by: Marc Mutz <marc.mutz@qt.io> (cherry picked from commit 9c60c8b122e5eb74fe74e11b929c30aa19ec0dd3) Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update bundled zlib to version 1.2.12André Klitzing2022-04-0121-1082/+10921
| | | | | | | | | | | | | | | The remaining diff to clean 1.2.12 is archived in the qtpatches.diff file. Also this fixes CVE-2018-25032. [ChangeLog][Third-Party Code] zlib was updated to version 1.2.12. Change-Id: Ifab5d57acdc90ace61f2fd22c6dbb7ec6b4ad319 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit a0a2bf2d95d4fcd468b6ce3c2e728d95425dd760) Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 168ff3419f256fdb35b586275d293fc0cd773fe1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix compilation for wasmEirik Aavitsland2022-03-141-0/+2
| | | | | | | | | | | libjpeg's internal putenv() function uses system setenv(), but that is not found when building for webassembly. Just disable the entire putenv function, since it is not used anyway. Change-Id: I1eb60f31562ef4e33c656ff3b3752bef6f88fcb8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 31d401dec6abccab4e780a323b8536025b7bbf1c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update bundled libjpeg-turbo to version 2.1.3Eirik Aavitsland2022-03-0332-223/+280
| | | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.1.3 Change-Id: I69ebd10641b07af324f6ae056cddb65cc0b5ce82 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 03b930470365bd32f93d761bc823d456e8de6853) Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* ANGLE: Load the DirectX libraries from the system path directlyAndy Shaw2022-03-023-4/+99
| | | | | | | Pick-to: 5.12 Change-Id: I34812b32e420a6f50e5be6b26b97c8e21e0e7870 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* SQLite: Update SQLite to v3.37.2Andy Shaw2022-02-253-43/+87
| | | | | | | | Fixes: QTBUG-100907 Change-Id: I6e31b2ba19443ed6554a343423dcfd2ca6d0ac2f Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit baa2d09d0d085843600282b19ec6f2362d4c8a79) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* SQLite: Update SQLite to v3.37.0Andy Shaw2022-01-062-6391/+8448
| | | | | | | | | [ChangeLog][QtSQL][SQLite] Updated SQLite to v3.37.0 Change-Id: I5b6ec6f7a3c4be551ce73d46557e43bbce657854 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit c20b213eabd8138f8566c7a1fd0633625c47b520) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Replace CopyrightFile entry in libjpeg qt_attribution.jsonKai Köhne2021-12-072-13/+12
| | | | | | | | | | CopyrightFile is only supported by qtattributionsscanner since version Qt 6. This amends commit 804288cab3 Change-Id: I57fa7f9cfb32ed98a26306bf88f7d02ef46224cf Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 8c47a86eecd286dbe66ca55ed4deaaf0f901d13b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Granularily disable PCRE2 JIT on macOS ARMTor Arne Vestbø2021-11-111-1/+1
| | | | | | | | | | | | | | | | | 2f8df4d1a87df9dd67913b016171dac20839d16e disabled the PCRE2 JIT on macOS for ARM, but did so based on the build system architecture configure test. When doing a universal build these configure tests are based on the primary architecture (x86_64 in our case), which means we ended up still enabling the JIT. We work around it by passing the PCRE2_DISABLE_JIT define only when building the arm64 slice. Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (adapted from f111c376d6535ef8c60a34ddd4682fcfa0f4e2bb) Change-Id: I7a41b92efdb7e65a631ba4d37c177b43cfb816fd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Update Gradle to 7.2.0 and Android Gradle Plugin to 7.0.2Assam Boudjelthia2021-11-088-1166/+690
| | | | | | | | | | | | | | | The latest build-tools 31.0.0 requires AGP version 7.0+, and that requires Gradle version 7.0+, so use the latest stable release for both. [1] https://developer.android.com/studio/releases/gradle-plugin? buildsystem=ndk-build#updating-gradle Fixes: QTBUG-97002 Change-Id: I8ff26819bdf1a00f484ecc194c4d4e7bca2b598a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> (cherry picked from commit 5ea712987be3bed4c15e486d96851b46f466e944) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* PCRE2: upgrade to 10.39Giuseppe D'Angelo2021-11-036-3170/+3284
| | | | | | | | | | | New upstream release. [ChangeLog][Third-Party Code] PCRE2 has been updated to version 10.39. Change-Id: Ic8db3035bad41a8cdb0d735e593e71124b5df9d2 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit efc1cd5799f692cfbc76bdfe1099d75141558c9b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update PCRE2 to 10.38Giuseppe D'Angelo2021-10-0226-991/+1366
| | | | | | | | | [ChangeLog][Third-Party Code] PCRE2 has been updated to version 10.38. Change-Id: Ib6ab544790747a94a00b8eb516314ff3c57e4c79 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit b4e290a9ab9bf1ba65002b6b6af6c9965595923b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update the COPYRIGHT.txt fileEirik Aavitsland2021-09-281-2/+2
| | | | | | | | | With the contents from src/jversion.h Change-Id: I3d4d2b40b3ed6576655b97b1709ee42c9c81ebe7 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit fbd3b00e0b342b9291ee5cb60d3611e3878c6a7a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update bundled libjpeg-turbo to version 2.1.1Eirik Aavitsland2021-09-2212-24/+81
| | | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.1.1 Change-Id: I22a273018229aa35a175f9e903fa605a3eb55c32 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit a6a3b1e79cf9bd54434ccdb0851fe49f12004152)
* SQLite: Update SQLite to v3.36.0Andy Shaw2021-09-223-2976/+4341
| | | | | | | | | [ChangeLog][QtSQL][SQLite] Updated SQLite to v3.36.0 Change-Id: I05cde47b757455dfd438405bfba1818c7f6eec00 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit b919fc8fd038bd04a88717269dce1fdf443af442) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix license information for libjpeg-turboKai Köhne2021-09-204-15/+65
| | | | | | | | | | | | | | Fix the license metadata in that libjpeg contains parts under three different bsd-like licenses. Also, do include the IJG, zlib license texts in the metadata. [ChangeLog][Third-Party Code] Clarified that libjpeg-turbo is actually covered by three licenses, not only IJG. Change-Id: I6c4e3e8577bdf83e7e73474b34b0553cbe1d9b6d Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit 467b39d52c9ab59b1e7518330fbb51d5543ada50) Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Update bundled Freetype to 2.10.4Liang Qi2021-08-17577-20564/+7370
| | | | | | | | | | | | | | | | | | | Removed everything, imported with help of import_from_tarball.sh script, and then added a pre-generated builds/unix/ftconfig.h This also amends 58f56950848bae9c90da3873090c7698e0128b12 because it is not a clean update, some old files are still there. Also redo the fix for wasm like 30f4ca4e4fbc1d8cf86808dbeb00ec3c046f6c1c. Fixes: QTBUG-82480 Pick-to: 6.2 Change-Id: I45ee3230299908ca0372e035636dd64b6c549a27 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit cfa631e0fb5d78aac80cb580eb092fafa1cd9a8f) Reviewed-by: Liang Qi <liang.qi@qt.io>
* Fix memory leak if eXIf has incorrect crcRobert Löhning2021-08-122-4/+19
| | | | | | | | | | | | | | Change eb6767 from upstream repo. Fixes oss-fuzz issue 23376. [ChangeLog][Third-Party Code][libpng] Fix for possible memory leak in libpng was backported. Change-Id: Id0c2f8b8bd60438ae8b5a61c83b6e50d55c6eb65 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 76e2409cc908d1fa6ee6c7ff61b699594244bf6c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update md4c to 0.4.8Kai Köhne2021-06-212-28/+67
| | | | | | Change-Id: Ib0e1ef259696aa380aba0819aa4e1d8a12b4a21d Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 1759626cd61fbc765d21ce458cc5d472db087f3e)
* PCRE2: upgrade to 10.37Giuseppe D'Angelo2021-05-3114-179/+973
| | | | | | | | | | New upstream release. Change-Id: I3a7e6c3d6706c940c0a279e4b63e1bfd96cc242c Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 4ee4b7a8716dd2ffb7b67032aaa0766bc9b33bdb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* SQLite: Update SQLite to v3.35.5Andy Shaw2021-05-273-94/+187
| | | | | | | | | | [ChangeLog][QtSQL][SQLite] Updated SQLite to v3.35.5 Change-Id: I7e1f5a4b6eb48d9f6105d7f08b35a2c62fc79660 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 75d8623752e67a39e2ee04e5233dc502e63a17f1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Cherry-pick upstream patch for non-gcc/clang/msvc compilersAllan Sandfeld Jensen2021-05-223-4/+15
| | | | | | | | | | Fix build w/ non-GCC-compatible Un*x/Arm compilers Fixes: QTBUG-93779 Pick-to: dev 6.1 6.0 5.15 5.12 Change-Id: Ib52e9ded6e2814c7998d6cd798e945da0f87f7a1 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit 4341f6763b8a737ebc07bb78ead22bc05a1a515b)
* Update bundled libjpeg-turbo to version 2.1.0Eirik Aavitsland2021-05-2139-667/+1079
| | | | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.1.0 Change-Id: I82a58609120923c18f6031fec7d597138ec473ee Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 127f617387c00139dddbfc9438ab032e24559566) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Simplify bundled libjpeg buildEirik Aavitsland2021-05-203-2/+2
| | | | | | | | | | | | Move the config headers of the bundled libjpeg back into its source directory, where they originally live, to avoid having to trick with the include path to find them. The goal is unification across maintained Qt branches, making version updates simpler. Change-Id: I5b574446bbd264b0a1cb3efceb4c1cb7203cac7d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 5df88b85c6e61409c5c759e78f32edaac7b2022f)
* Disable Harfbuzz/CoreText hotfix on older macOS/iOS versionsEskil Abrahamsen Blomfeldt2021-03-222-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the new default font on macOS 11 and iOS 14 does not have the AAT tables we usually check for, we added a check for TRAK as well, otherwise we would end up applying the wrong kerning rules to the font in these newer versions of the operating systems. However, this introduced a regression on older versions when letter spacing was set. This basically just disables the ligature features when shaping, so the reason is not fully understood, but the assumption is that it exposes a bug in the CoreText shaper backend in Harfbuzz which was previously hidden. The pragmatic fix for this is a second hotfix which disables the previous one on older OS versions, since: A. The original bug does not occur on older versions. B. Newer versions of Harfbuzz (and therefore Qt) does not exhibit the problem since this code path is no longer used. To do this we also need to rename the hb-coretext.cc file to .mm to enable using the Objective-C APIs. This is all pretty ugly, but it is not upstreamed anywhere and has limited lifespan. [ChangeLog][macOS/iOS] Fixed a regression when combining letter spacing with the default font on macOS 10.15 and lower or iOS 13 or lower. Fixes: QTBUG-91764 Change-Id: I50c8ad08d51899635418aeaa38230bbeab5c5ef7 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* SQLite: Update to 3.35.2Andy Shaw2021-03-203-4599/+7020
| | | | | | | | | [ChangeLog][QtSQL][SQLite] Updated SQLite to v3.35.2 Change-Id: I1e784627d7ed3a226acfbb28d8379d4c69f91a84 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 022fd8e79cfa25049f262bbd6aef4298f14b4d96) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* MODULE_INCLUDEPATH is supposed to be one pathAllan Sandfeld Jensen2021-03-152-3/+3
| | | | | | | Avoid the moving of jconfig.h, and messing up MODULE_INCLUDEPATH Change-Id: Ib66e8a47cff80f252a7bfb3363b73f63bdbaab8a Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Update bundled libjpeg-turbo to version 2.0.6Eirik Aavitsland2021-03-0527-152/+237
| | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.0.6 Change-Id: I3e308d241853edf3c1d616955cda203220a258d8 Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit ede0082f861146d441df641d93f815dbe63a9076)
* SQLite: Update to 3.34.0Andy Shaw2021-01-283-730/+2030
| | | | | | | | | | [ChangeLog][QtSQL][SQLite] Updated to 3.34.0 Fixes: QTBUG-90226 Change-Id: I2a489bec1fee2bdee7ea474094ca3db308699753 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 722a7dda56a5ac6d43c686c4fbf7b105b5544d88) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>