diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2022-03-31 12:41:13 +0200 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2022-04-22 14:34:47 +0200 |
| commit | 48561178e2488e6fe7763c2229d66072810afcb3 (patch) | |
| tree | 4e5347a261a5dcd79d50c982aaf066173c6d5d41 /src/3rdparty/zlib/src/gzguts.h | |
| parent | e3941facca2e365bb2eb961edd7085d081c64220 (diff) | |
zlib as static library
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>
Diffstat (limited to 'src/3rdparty/zlib/src/gzguts.h')
| -rw-r--r-- | src/3rdparty/zlib/src/gzguts.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/3rdparty/zlib/src/gzguts.h b/src/3rdparty/zlib/src/gzguts.h index 3ec32af25f..26d2ac9bd0 100644 --- a/src/3rdparty/zlib/src/gzguts.h +++ b/src/3rdparty/zlib/src/gzguts.h @@ -3,20 +3,7 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ -#ifdef _MSC_VER -# ifndef _CRT_SECURE_NO_DEPRECATE -# define _CRT_SECURE_NO_DEPRECATE -# endif -# ifndef _CRT_NONSTDC_NO_DEPRECATE -# define _CRT_NONSTDC_NO_DEPRECATE -# endif -// disable warnings like '=': conversion from 'size_t' to 'unsigned int', possible loss of data -# pragma warning(disable: 4267; disable: 4244) -#endif - -#ifndef QT_BOOTSTRAPPED -# include <qconfig.h> -#endif +#include <qconfig.h> #ifdef QT_VISIBILITY_AVAILABLE #define HAVE_HIDDEN |