summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Collapse)AuthorAgeFilesLines
* 3rdparty: apply a fix to the last zlib fixThiago Macieira2022-09-062-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: Thiago Macieira <thiago.macieira@intel.com>
* 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-312-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-033-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-22512-6130/+35541
| | | | | | | | | | | | | | | ftdebug.c files are new, adapted the import script to copy the source file for Windows as well. Replaced the CMakeLists.txt content that was imported from the .pro file with the respective variables and logic from the freetype CMakeLists.txt file, which should make it easier to maintain this next time. Fixes: QTBUG-105032 Change-Id: I1e846167b268df4b1b0a50dcec602def1a0bdcb4 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit e79d7f12e6ca15c499a553e4a701a2887e4b184c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update qt_attribution for harfbuzzEskil Abrahamsen Blomfeldt2022-05-241-1/+1
| | | | | | | | | | | | | | | | Amends d88da0b2b0a8abaaa521bef864378fe1dbf86709 where I forgot updating the attribution. Note that the original change was never picked to 6.2 after all, since that is on an even older version of Harfbuzz, therefore this one is only picked to 6.3. Given the phase 6.2 is in, I decided it was better to leave it, since it didn't get the 3.0.0 update either. Task-number: QTBUG-103603 Change-Id: Ie323d931b49158776c2b9fcc4835b69ca4e2f905 Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit 1221cd1f1b91610427f9037baaca0a0fda5a3d97) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update Harfbuzz to version 4.2.1Eskil Abrahamsen Blomfeldt2022-05-24188-6081/+13697
| | | | | | | | | | | | [ChangeLog][QtGui][Text] Updated the Harfbuzz code included with Qt to version 4.2.1. Fixes: QTBUG-103603 Change-Id: I45fdde8fd0772e4470304c5f6f5a876666356d04 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit d88da0b2b0a8abaaa521bef864378fe1dbf86709) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* zlib as static libraryKai Köhne2022-04-255-38/+57
| | | | | | | | | | | Do build zlib as static 3rdparty library. This makes it easier to disable warnings. Change-Id: I1db331b671b64e68d81c56b0df337983c3bbe7fa Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 48561178e2488e6fe7763c2229d66072810afcb3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Upgrade PCRE2 to 10.40Giuseppe D'Angelo2022-04-2447-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: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* forkfd: don't attempt to guess EWOULDBLOCK when WNOHANG is activeThiago Macieira2022-04-051-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reading the kernel sources, I was sure we'd get an ECHILD if the child hadn't exited yet, but that's not the case. We only get ECHILD if the current process has no child processes. But if we do have one and the one we're waiting for hasn't exited, waitid() returns 0. So let's not attempt to correct it with forkfd_wait() or forkfd_wait4(). Those have "wait" in the name, so they should behave exactly the same way. The man pages say: waitpid(): if WNOHANG was specified and one or more child(ren) specified by pid exist, but have not yet changed state, then 0 is returned. waitid(): returns 0 on success or if WNOHANG was specified and no child(ren) specified by id has yet changed state This was found while studying QTBUG-100174. QProcess does not use this code path (blocking mode forkfd only). Matching OpenDCDiag PR: https://github.com/opendcdiag/opendcdiag/pull/62 Change-Id: Ibf4acec0f166495998f7fffd16d6de6853a6e5a8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit c4d78703e0052c9ffa9c9fd27cc5365b53811a32) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update bundled zlib to version 1.2.12André Klitzing2022-03-3121-1091/+10919
| | | | | | | | | | | | | 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 Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add missing install of pnglibconf.h for static buildsMichal Klocek2022-03-171-0/+1
| | | | | | | | | | | Installing only pngconf.h is not enough. This commit amends be2745e4788cecb0d3122081e3328e4b66923609 Change-Id: I8de1565434c315c7197d4602a8460ead794176d7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 2f894293aee187726599793fcf33f28fc5093829) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix compilation for wasmEirik Aavitsland2022-03-161-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>
* Install also config headers for 3rdparty libjpegMichal Klocek2022-03-101-0/+2
| | | | | | | | | Amends be2745e4788cecb0d3122081e3328e4b66923609 Change-Id: I9dd1a6858e9e9c9c3749dd33eeda3b1c509b69b3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 2de667a6ff1d4b0706a9b6063d6b62a416fb50f1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update bundled libjpeg-turbo to version 2.1.3Eirik Aavitsland2022-03-0333-222/+279
| | | | | | | | | [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: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Gradle: Update to 7.4Mårten Nordheim2022-03-023-3/+3
| | | | | | | | | | Fixes: QTBUG-100989 Change-Id: I7978afc18a51b58ea95e4fb94328c4f98bb12486 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 6782a37bb5fdb8e6f1acc0471eb1cf0d7dea4afa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* SQLite: Update SQLite to v3.37.2Andy Shaw2022-02-223-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>
* Install 3rdparty headers for static buildsMichal Klocek2022-02-225-15/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | For static builds we need 3rdparty headers to be installed. Leaf modules like qtwebengine needs 3rdparty libs and header for zlib, freetype, harfbuzz, png, jpeg. Without those the Chromium bundled versions are used, however it might end up badly if qt has already bundled one. Introduce new header only modules with additional arguments for qt_internal_add_module: * EXTERNAL_HEADERS to pick exactly which headers are public * EXTERNAL_HEADERS_DIR to include whole directory preserving the files directory structure Fix qtsync so it keep directory structure for all non-qt modules when syncing headers and do not generate warnings for headers files. Task-number: QTBUG-87154 Task-number: QTBUG-88614 Change-Id: If1c27bf8608791cd4e0a21839d6316a445a96e9f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit be2745e4788cecb0d3122081e3328e4b66923609)
* 3rdparty: Update double-conversionMårten Nordheim2022-02-2214-72/+162
| | | | | | | | | | | | | | | | | The old patch is removed but another was needed to fix a warning from MSVC about truncation which is taken from e634f265db5d296bd7a780f9813d6b8573f5bd90 in the master branch. Since there is no other changes to the double-conversion directory between 3.2.0 and that change we are essentially using that commit directly. Fixes: QTBUG-100988 Change-Id: Ia69f39f61ef989907fdf097f897bece0b3af7194 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit b1d8fb327920a5e0c4c062ab4eed7768a89af4b3) 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>
* 3rdparty: Add touchpad gestures support to bundled xinput xcb modulePovilas Kanapickas2021-11-135-8/+505
| | | | | | | | | | This feature can easily be backported to our bundled version of libxcb because the feature is pretty much self-contained (just a couple of new events and parsing support) and does not depend on newer features of libxcb that have appeared since our bundled version of 1.13. Change-Id: If965e3de8b898286cd61c7fddbf335894f3a3ff5 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Doc: Remove broken homepage link for Vera fonts attributionLuca Di Sera2021-11-051-1/+0
| | | | | | | | | | | | | | | | The attribution for the Vera Fonts project declares a page on the gnome domain as the homepage of the fonts. The page is not maintained anymore and was removed from the gnome domain. Hence, we remove the "Homepage" key from the Vera Fonts attribution as no homepage seems to exists at the moment. Task-number: QTBUG-96127 Pick-to: 6.2 Change-Id: If4801eb96ce5568c4c18ecea7807ad87e165ca2a Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* 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 Pick-to: 5.15 6.2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* 3rdparty: update TinyCBOR links to 0.6.0 final releaseThiago Macieira2021-11-011-2/+2
| | | | | | | | No code change. Pick-to: 6.2 Change-Id: Ice04365c72984d07a64dfffd16b28c74ee1c07eb Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Update Gradle to 7.2.0 and Android Gradle Plugin to 7.0.2Mårten Nordheim2021-10-228-1077/+583
| | | | | | | | | | | | | | 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 Pick-to: 6.2 Change-Id: I8ff26819bdf1a00f484ecc194c4d4e7bca2b598a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update Harfbuzz to version 3.0.0Ievgenii Meshcheriakov2021-10-0555-6987/+7701
| | | | | | | | | [ChangeLog][Text] Updated bundled Harfbuzz to version 3.0.0. Change-Id: I8d9fb465586bc1dbe58ce91b7f49c8483982c75a Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Android: fix Gradle version in qt_attribution fileAssam Boudjelthia2021-10-021-1/+1
| | | | | | | | | | | | The Gradle version in qt_attribution.json doesn't mention the actual version that is currently used. This amends 67c3f3f4ffcadba32ea42522a36b3f6d88fc3482. Pick-to: 6.2 Fixes: QTBUG-71328 Change-Id: I50fbabd56beb44389f9453666822f9667bab7d61 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* 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 Pick-to: 6.2 5.15 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Update the COPYRIGHT.txt fileEirik Aavitsland2021-09-281-2/+2
| | | | | | | | With the contents from src/jversion.h Pick-to: 6.2 5.15 5.12 Change-Id: I3d4d2b40b3ed6576655b97b1709ee42c9c81ebe7 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* 3rdparty: Fix forwards-compatibility bug in bundled xinput xcb modulePovilas Kanapickas2021-09-203-25/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | libxcb thinks that it knows about all device class types sent by the X server XInput extension. With the addition of touchpad gestures in XInput 2.4 and X server 21.1 this is no longer the case and libxcb fails horribly by thinking that the protocol was malformed. The X server currently has a workaround, but it would not address the following situation: - there are multiple modules within the same X client (e.g. part of the application uses Qt, another part talks to X server via another library) - both of the modules talk to XI - at least one module requests for XI 2.4 protocol support. The request for XI 2.4 disables the workaround on the X server and Qt side would crash horribly. This bug is being fixed upstream in these MRs: https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/merge_requests/23 https://gitlab.freedesktop.org/xorg/lib/libxcb/-/merge_requests/20 Change-Id: Idf345271340031152b512ef59f619313be5ec226 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Fix invalid JSON due to missing comma after valueCraig Scott2021-09-101-1/+1
| | | | | | | | | Amends 248828b9a3562fc23ac1d39733aaf07a83584dc4 Pick-to: 6.2 6.2.0 Change-Id: I606835942e988736786aaf6881ecddc94c8a882c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* SQLite: Update SQLite to v3.36.0Andy Shaw2021-09-083-2976/+4341
| | | | | | | | [ChangeLog][QtSQL][SQLite] Updated SQLite to v3.36.0 Pick-to: 6.2 6.2.0 5.15 5.12 Change-Id: I05cde47b757455dfd438405bfba1818c7f6eec00 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* 3rdparty: Update TinyCBOR to v0.6-rc1Thiago Macieira2021-09-0611-30/+32
| | | | | Change-Id: Ie72b0dd0fbe84d2caae0fffd16a169a70845d33e Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Update bundled libjpeg-turbo to version 2.1.1Eirik Aavitsland2021-09-0112-24/+81
| | | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.1.1 Pick-to: 6.2 5.15 5.12 Change-Id: I22a273018229aa35a175f9e903fa605a3eb55c32 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Replace FreeBSD's strtou?ll() with std::from_chars()-based strntou?ll()Edward Welbourne2021-08-305-453/+0
| | | | | | | | | | | | | | | Remove third-party code in favor of STL. Implement (for now) strtou?ll() as inlines on strntou?ll() calling strlen() for the size parameter. (This is not entirely safe, as a string lacking '\0'-termination but with at least some non-matching text after the numeric portion would formerly be parsed just fine, but would now produce a crash. However, strtou?ll() are internal and callers should be ensuring '\0'-termination.) Task-number: QTBUG-74286 Change-Id: I0c8ca7d4f6110367e93b4c0164854a82c5a545e1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Update Harfbuzz to version 2.9.0Eskil Abrahamsen Blomfeldt2021-08-23144-2295/+7313
| | | | | | | | | | [ChangeLog][Text] Updated bundled Harfbuzz to version 2.9.0. Pick-to: 6.2 Change-Id: Ib8fed753b99a127d5a4cc793c5c1d55a0090f902 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Update bundled Freetype to 2.10.4Liang Qi2021-08-16577-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>
* Fix memory leak if eXIf has incorrect crcRobert Löhning2021-08-102-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 Pick-to: 6.2 6.1 5.15 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix harfbuzz-ng compilation for IntegrityTatiana Borisova2021-06-281-0/+6
| | | | | | | | Add --restrict definition, because GHS compiler doesn't support it by default Pick-to: 6.2 Change-Id: I6766f2fe309802ad9de333edd6ed43f7a187616f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* md4c: Fix MSVC compiler level 3 warningsKai Köhne2021-06-152-4/+44
| | | | | | | | | | | Fix various C4244 warnings with the MSVC compiler for 64 bit Proposed upstream fix: https://github.com/mity/md4c/pull/162 for an upstream fix, Pick-to: 6.1 6.2 Change-Id: I2ac1c17febb4fb269ac7244458f4cd90ce8b8e49 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Update md4c to 0.4.8Kai Köhne2021-06-162-28/+67
| | | | | | Pick-to: 6.1 6.2 5.15 Change-Id: Ib0e1ef259696aa380aba0819aa4e1d8a12b4a21d Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Fix license information for libjpeg-turboKai Köhne2021-06-044-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. Pick-to: 6.1 6.0 Change-Id: I6c4e3e8577bdf83e7e73474b34b0553cbe1d9b6d Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* blake2: Fix MSVC warning C4804Kai Köhne2021-05-312-4/+4
| | | | | | Pick-to: 6.1 Change-Id: I392da957b9cc84f55bb8eaeb888ca5dd35ec36f2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* PCRE2: upgrade to 10.37Giuseppe D'Angelo2021-05-3114-179/+973
| | | | | | | | | New upstream release. Change-Id: I3a7e6c3d6706c940c0a279e4b63e1bfd96cc242c Pick-to: 6.1 5.15 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Attributions: Don't mention QT_CRYPTOGRAPHICHASH_ONLY_SHA1Mårten Nordheim2021-05-232-2/+2
| | | | | | | | | | It's only meant for bootstrap builds. Considering that SHA1 is deprecated by NIST we should not artificially limit ourselves to using only that. Task-number: QTBUG-93838 Change-Id: Ib779ad4e4349cfdc71d797eb3ba5ccfb7747e933 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Granularily disable PCRE2 JIT on macOS ARMTor Arne Vestbø2021-05-191-4/+3
| | | | | | | | | | | | | | 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. Change-Id: I60df82acb57030ccef8b117a40209eb107b1d5bd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Cherry-pick upstream patch for non-gcc/clang/msvc compilersAllan Sandfeld Jensen2021-05-183-4/+15
| | | | | | | | | | Fix build w/ non-GCC-compatible Un*x/Arm compilers Fixes: QTBUG-93779 Change-Id: Ib52e9ded6e2814c7998d6cd798e945da0f87f7a1 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> (cherry picked from commit 4341f6763b8a737ebc07bb78ead22bc05a1a515b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* SQLite: Update SQLite to v3.35.5Andy Shaw2021-05-093-94/+187
| | | | | | | | | [ChangeLog][QtSQL][SQLite] Updated SQLite to v3.35.5 Pick-to: 6.1 5.15 5.12 Change-Id: I7e1f5a4b6eb48d9f6105d7f08b35a2c62fc79660 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update bundled libjpeg-turbo to version 2.1.0Eirik Aavitsland2021-05-0539-667/+1079
| | | | | | | | | [ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.1.0 Pick-to: 6.1 6.0 5.15 5.12 Change-Id: I82a58609120923c18f6031fec7d597138ec473ee Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Simplify bundled libjpeg buildEirik Aavitsland2021-05-053-1/+1
| | | | | | | | | | | | 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. Pick-to: 6.1 6.0 5.15 5.12 Change-Id: I5b574446bbd264b0a1cb3efceb4c1cb7203cac7d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 00:19:24 +0000