Revision control
Copy as Markdown
diff --git a/src/ChangeLog b/src/ChangeLog
index 312753edade..41b886d3dbe 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,10 @@
ChangeLog file for zlib
+Changes in 1.3.2 (Qt)
+- This is a stripped down copy of zlib that contains patches to
+ make it compile as part of Qt. See also "qtpatches.diff".
+
Changes in 1.3.2 (17 Feb 2026)
- Continued rewrite of CMake build [Vollstrecker]
- Various portability improvements
diff --git a/src/README b/src/README
index 2b1e6f36fe3..d3bb24178ad 100644
--- a/src/README
+++ b/src/README
@@ -6,6 +6,9 @@ library is described by RFCs (Request for Comments) 1950 to 1952 at
format) and rfc1952 (gzip format).
+This is a stripped down copy of zlib that contains patches to make it compile
+as part of Qt. See also "qtpatches.diff".
+
All functions of the compression library are documented in the file zlib.h
(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example
of the library is given in the file test/example.c which also tests that
diff --git a/src/gzguts.h b/src/gzguts.h
index 266305debc8..337407b8cec 100644
--- a/src/gzguts.h
+++ b/src/gzguts.h
@@ -3,6 +3,12 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/
+#include <qconfig.h>
+
+#ifdef QT_VISIBILITY_AVAILABLE
+#define HAVE_HIDDEN
+#endif
+
#ifdef _LARGEFILE64_SOURCE
# ifndef _LARGEFILE_SOURCE
# define _LARGEFILE_SOURCE 1
diff --git a/src/zconf.h b/src/zconf.h
index 828ca617e90..d9f295613f5 100644
--- a/src/zconf.h
+++ b/src/zconf.h
@@ -8,6 +8,9 @@
#ifndef ZCONF_H
#define ZCONF_H
+/* Since Qt Core must export these symbols, define Z_PREFIX to avoid clashes system zlib */
+#define Z_PREFIX
+
/*
* If you *really* need a unique prefix for all types and library functions,
* compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
@@ -147,6 +150,7 @@
# endif
# define zlibCompileFlags z_zlibCompileFlags
# define zlibVersion z_zlibVersion
+# define z_errmsg z_z_errmsg
/* all zlib typedefs in zlib.h and zconf.h */
# define Byte z_Byte
@@ -443,7 +447,7 @@ typedef uLong FAR uLongf;
typedef unsigned long z_crc_t;
#endif
-#if HAVE_UNISTD_H-0 /* may be set to #if 1 by ./configure */
+#if HAVE_UNISTD_H-0 || !defined(WIN32) /* may be set to #if 1 by ./configure */
# define Z_HAVE_UNISTD_H
#endif
diff --git a/src/zlib.h b/src/zlib.h
index a57d3361342..f13704262ce 100644
--- a/src/zlib.h
+++ b/src/zlib.h
@@ -37,11 +37,15 @@
# include "zconf.h"
#endif
+#include <qglobal.h>
+#undef ZEXTERN
+#define ZEXTERN Q_CORE_EXPORT
+
#ifdef __cplusplus
extern "C" {
#endif
-#define ZLIB_VERSION "1.3.2"
+#define ZLIB_VERSION "1.3.2 (Qt)"
#define ZLIB_VERNUM 0x1320
#define ZLIB_VER_MAJOR 1
#define ZLIB_VER_MINOR 3
diff --git a/src/zutil.h b/src/zutil.h
index a9bc23ca629..0cf9bec6cff 100644
--- a/src/zutil.h
+++ b/src/zutil.h
@@ -13,6 +13,12 @@
#ifndef ZUTIL_H
#define ZUTIL_H
+#include <qconfig.h>
+
+#ifdef QT_VISIBILITY_AVAILABLE
+#define HAVE_HIDDEN
+#endif
+
#ifdef HAVE_HIDDEN
# define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
#else
@@ -165,7 +171,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
# define OS_CODE 18
#endif
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(OS_CODE)
# define OS_CODE 19
#endif