summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/zlib
Commit message (Collapse)AuthorAgeFilesLines
* Update Zlib to 1.3.1Mårten Nordheim2024-01-2515-117/+147
| | | | | | | | | | | [ChangeLog][Third-Party Code] zlib was updated to version 1.3.1. Task-number: QTBUG-121325 Fixes: QTBUG-121444 Pick-to: 6.7 6.6.2 6.6 6.5 6.2 5.15 Change-Id: I0a72b7966916ccb825c7a8ae251e09b2914f0cf4 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Dennis Oberst <dennis.oberst@qt.io>
* Update bundled zlib to version 1.3Dennis Oberst2023-09-0527-1543/+1006
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zlib 1.3 has been available since August 18, 2023. Version 1.3 now defines the following: # define crc32_combine_gen z_crc32_combine_gen # define crc32_combine_gen64 z_crc32_combine_gen64 # define crc32_combine_op z_crc32_combine_op We patched those in manually with qtpatches.diff, so we update it to reflect these changes. Updated the diff with 'git diff --relative > qtpatches.diff' from within the 3rdparty/zlib directory. Since updating zlib always requires some manual intervention add a minimal guide that will be printed on using import_from_zlib_tarball.sh. As a drive-by fix an error in import_from_zlib_tarball.sh where passing in a path already containing a backslash as: import_from_zlib_tarball.sh zlib-1.x/ ./ would append another backshlash to that path (zlib-1.x//). Furthermore add the '-v' flag to the copy command to make it more verbose. [ChangeLog][Third-Party Code] zlib was updated to version 1.3. Task-number: QTBUG-116236 Pick-to: 6.6 6.5 6.2 5.15 Change-Id: Ib7c8698035e1e049b455308c5774fcaf88b7622a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Fix license info for import shell scriptsKai Köhne2023-04-261-38/+3
| | | | | | | | | | Use SPDX-License-Identifier also for shell scripts. Also change license to LicenseRef-Qt-Commercial OR GPL-3.0-only, which makes arguably more sense than LGPL. Pick-to: 6.5 Change-Id: I3a46468f264747916aacbf206f5ccba28b6c6593 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Highlight third-party modules that are security criticalKai Köhne2023-03-311-0/+2
| | | | | | | | | | | | | | Mark any modules listed as 'processing untrusted content' in https://wiki.qt.io/Third_Party_Code_in_Qt also in the qt_attribution.json files. For reasoning, see also https://lists.qt-project.org/pipermail/development/2023-February/043667.html Pick-to: 6.5 Change-Id: Id547d4f7e77dac8c7e8e382e65169e7bd0330fcf Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Utilize NO_UNITY_BUILD arguments instead of manual exclusionAmir Masoud Abdol2023-03-141-2/+0
| | | | | | | | | | | Unity build is disabled by default for all 3rdparty libraries, so we don't need to set the manually anymore; and for the plugins we can use NO_UNITY_BUILD instead. Pick-to: 6.5 Task-number: QTBUG-109394 Change-Id: Ia2f83ae083924d31adf07e7647b34ae6571ed01f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Add some exclusions for CMake Unity (Jumbo) buildsFriedemann Kleint2023-02-161-0/+2
| | | | | | | | | | | | | Add exclusions for issues that are likely not fixable (3rd party code, X11 define clashes, etc) in 3rd party, tools and plugins. Pick-to: 6.5 Task-number: QTBUG-109394 Done-with: Amir Masoud Abdol <amir.abdol@qt.io> Change-Id: I698c004201a76a48389271c130e44fba20f5adf7 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_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 Pick-to: 6.4 6.2 5.15 Change-Id: Iaa2a9486f1cbbcd6a23d48df632e01bc05b414d5 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Replace the syncqt.pl script with syncqt toolAlexey Edelev2022-09-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | syncqt.pl adds an extra dependency on perl when building Qt. Modern C++ provides the convenient cross-platform way to access a filesystem and to use regular expressions, so we may replace the perl script with C++ application. The syncqt executable is built at configure time and installed as QtCore tool. It's running at configure time to deliver the required header files for IDE to build a consistent code model and at the build time to keep tracking changes in header files and generate the missing aliases without reconfiguring. 'syncqt' only parses header files from a CMake build tree, so the resulting Qt installation only contains interfacing headers that belong to the platform that Qt is built for. 'sync.profile' files are not used as the 'source of truth' for sync qt procedure anymore, all the necessary information is taken from either CMake files at configure time or from the module header files while parsing them. syncqt.pl is still in place since it's required as fallback solution for a smooth transition to the new syncqt implementation for all qt repositories. This patchset only enables the C++ based syncqt for 'qtbase' repository. From the performance perspective C++ version works faster then perl script, also the configure time is reduced significally on subsequent reconfigurations - up x2 times faster when re-configuring repository, but it also takes time to compile the tool itself the first time. Numbers for qtbase: syncqt.pl syncqt.cpp initial: 0m16,035s 0m20,413s reconfig: 0m6,819s 0m3,725s The syncing procedure can be run separately for each module using <ModuleName>_sync_headers targets. The 'sync_headers' target can be used to sync all the modules at once. Task-number: QTBUG-87480 Task-number: QTBUG-103196 Change-Id: I8c938bcaf88a8713b39bbfd66d9e7ef12b2c3523 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* 3rdparty: apply a fix to the last zlib fixThiago Macieira2022-09-062-2/+35
| | | | | | | | | Source: https://github.com/madler/zlib/commit/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Pick-to: 5.15 6.2 6.3 6.4 Change-Id: Ic6547f8247454b47baa8fffd17111732eb074b0a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* 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. Pick-to: 6.4 6.3 6.2 5.15 Change-Id: I83f88109a08cf7e7117f1c94b4557a2c36f519c3 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* 3rdparty/zlib: backport the fix to CVE-2022-37434Thiago Macieira2022-08-302-2/+38
| | | | | | | | Qt isn't known to be affected by this. Pick-to: 5.15 6.2 6.3 6.4 Change-Id: Ic6547f8247454b47baa8fffd171025f5a435a209 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* CMake: Don't use AUTOMOC for third party librariesAlexandru Croitor2022-07-251-0/+1
| | | | | | | | | | | None of them have Qt sources that need moc-ing. It's also needed to circumvent an AUTOMOC + PCH issue when AUTOMOC is enabled for a target that does not have any C++ sources, but the target links to another target that does have C++ sources. Pick-to: 6.4 Change-Id: Ib1b2aa766089f093117c1ba34e156dfe8b0957e6 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* zlib as static libraryKai Köhne2022-04-224-38/+52
| | | | | | | | | | Do build zlib as static 3rdparty library. This makes it easier to disable warnings. Pick-to: 6.3 Change-Id: I1db331b671b64e68d81c56b0df337983c3bbe7fa Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* 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 Pick-to: 6.2 6.3 6.3.0 5.15 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* zlib: Disable MSVC warning C4267Kai Köhne2021-04-262-1/+5
| | | | | | Pick-to: 6.1 Change-Id: Ifc51c1847841bb7172f79067facf0c7e425a042b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* zlib: Fix spelling of licenseKai Koehne2018-10-021-1/+1
| | | | | | | Follow spelling convention at https://spdx.org/licenses/Zlib.html Change-Id: Ib25b98cf7f3a052ec25ba6924748a962733e2ed8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Update bundled zlib to version 1.2.11André Klitzing2017-08-0450-7508/+3882
| | | | | | | | | | | Also clean up some unused files. The remaining diff to clean 1.2.11 is archived in the qtpatches.diff file. [ChangeLog][Third-Party Code] zlib was updated to version 1.2.11. Task-number: QTBUG-31020 Change-Id: I89f890904af48c6e9ba6eabc5d58f5adbe2c53f0 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* make bootstrapped build work entirely without generated headersOswald Buddenhagen2016-08-192-2/+6
| | | | | | | | | | | | | | instead, the only relevant defines from qconfig.h (QT_VERSION*) are passed on the command line, like we already did for qmake and configure.exe. this enables us to remove the early forwarding header generation from qtbase.pro, and rely wholly on the regular mechanism from syncqt + qt_module_headers.prf. another advantage is that we can be sure that the bootstrapped namespace is not polluted by the target feature configuration. Change-Id: If29285cfc697ae56b591e2ff1a2114686d18fb30 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Add qt_attribution.json filesKai Koehne2016-08-122-0/+43
| | | | | | | | | | | | | | The format is documented in http://wiki.qt.io/Qt_attribution.json Also add a LICENSE file in case there is none yet (usually copied from the source headers). Task-number: QTBUG-55139 Change-Id: Ib54c73d0bb9946cfd8579e86c6858035184ca516 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Fix visibility of bundled zlib symbols with mingwJohn Brooks2015-12-211-7/+2
| | | | | | | | | | | | When QT_VISIBILITY_AVAILABLE is defined, the zlib header would use visibility("default") instead of Q_DECL_EXPORT, but Windows needs dllexport for these symbols to be available to QtGui/QtNetwork. In practice, Q_CORE_EXPORT always has the correct behavior for the zlib symbols. Change-Id: I7ab8080528e437260f822ac33e9e4334e2a0fdc8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Fix WEC2013 build of zlib.Bjoern Breitmeyer2015-04-282-1/+27
| | | | | | Change-Id: I4d1908f1175ed39e2df8717fb0b5a17befe88744 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* zlib: rename z_errmsg symbol to avoid name clash when linking staticallyTim Blechmann2014-01-091-0/+1
| | | | | | | | Task-number: QTBUG-35301 Change-Id: I298fba7270ee49d4e2dfc624b18aa13ce25864be Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: aavit <eirik.aavitsland@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: Fix module name formatSze Howe Koh2013-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtCore -> Qt Core QtDBus -> Qt D-Bus QtDesigner -> Qt Designer QtGui -> Qt GUI QtImageFormats -> Qt Image Formats QtNetwork -> Qt Network QtPrintSupport -> Qt Print Support QtScript -> Qt Script QtSql -> Qt SQL QtSvg -> Qt SVG QtTest -> Qt Test QtWebKit -> Qt WebKit QtWidgets -> Qt Widgets QtXml -> Qt XML QtConcurrent -> Qt Concurrent (partial) QtQuick -> Qt Quick (partial) Also, distinguish between "module" and "library" Change-Id: Icb8aa695ae60b0e45920b0c8fce4dc763a12b0cd Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* remove usage of QT_MAKEDLL in favor of the new QT_STATIC macroJoerg Bornemann2012-09-141-3/+3
| | | | | | Change-Id: I411cab0d92a8cad6b4f3676afe5cee050c4b789b Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Namespace the bundled zlib symbols, to avoid clash with user zlibaavit2012-06-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | When Qt is being compiled and is using the bundled zlib, QtCore needs to export the zlib symbols, since zlib is needed in other Qt libraries as well. That gives a danger of a potentially disastrous symbol clash if the user later on links with both Qt and an external zlib (ref. e.g. QTBUG-15071). This commit enables a zlib compilation flag that causes all zlib symbols to be redefined with a prefix. Hence, they will not clash with a standard zlib. A minor drawback is that zlib.h will now have #defines for a few semi-normal identifiers. Hence, a couple of more changes are done: In the private qzip code, the identifer crc32 had to be renamed. QHttpNetworkReplyPrivate needed no change, but as a defensive measure the #include <zlib.h> is moved from the _p.h file to the .cpp file, to avoid surprising compilation errors later in code that include that header. This commit does not in itself solve the issue of how to let Qt libraries outside of qtbase use the same bundled zlib, but it is a prerequisite for that. Change-Id: If84105901a8c90d35009faffe660c85a6bd2fee5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixed MSVC compiler warning for zlib when compiling on WEC7.Janne Anttila2012-04-171-2/+6
| | | | | | | | | | | WEC7 mkspecs define _CRT_SECURE_NO_DEPRECATE globally. zlib redefined the same macro without checking if it is already defined. Added #ifdef guard to zlib when defining _CRT_SECURE_NO_DEPRECATE. Task-number: QTBUG-22512 Change-Id: I477b24b7bc0ebb4cd8a619b11668eceb0f5064d4 Reviewed-by: aavit <qt_aavit@ovi.com> (cherry picked from commit a0a970447d63e5c9afdb55d179d671d9c24e9061)
* Fixed zlib build for WEC7.Andreas Holzammer2012-02-112-10/+7
| | | | | | | | | | | | | | | errno in zutil.c is leftover, and not used anymore -> removed. In gzguts.h qfunctions_wince.h are included. To use this header qglobal.h is needed. In qfunctions_wince.h a special define section is added for zlib. Task-number: QTBUG-22507 Change-Id: I78ec78d22e2930a03b349a47ab3a3ad077277c42 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Initial import from the monolithic Qt.Qt by Nokia2011-04-2744-0/+18991
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-12 00:52:01 +0000