diff options
| author | Kai Köhne <kai.koehne@qt.io> | 2021-04-21 10:51:58 +0200 |
|---|---|---|
| committer | Kai Köhne <kai.koehne@qt.io> | 2021-04-26 10:59:30 +0200 |
| commit | 89f51a06809b71a8965de3c70c99664b22d04f57 (patch) | |
| tree | 3d7f7f0541eb7fbededd0e310f107f7a69d06905 /src/3rdparty | |
| parent | c58be606dd6df5634a4cd4835033c64bc9d112fe (diff) | |
zlib: Disable MSVC warning C4267
Pick-to: 6.1
Change-Id: Ifc51c1847841bb7172f79067facf0c7e425a042b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/zlib/qtpatches.diff | 4 | ||||
| -rw-r--r-- | src/3rdparty/zlib/src/gzguts.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/3rdparty/zlib/qtpatches.diff b/src/3rdparty/zlib/qtpatches.diff index 105dda967c..98a7b2c205 100644 --- a/src/3rdparty/zlib/qtpatches.diff +++ b/src/3rdparty/zlib/qtpatches.diff @@ -26,12 +26,14 @@ diff -ruN orig/gzguts.h src/gzguts.h +# 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) +#endif + #ifdef _LARGEFILE64_SOURCE # ifndef _LARGEFILE_SOURCE # define _LARGEFILE_SOURCE 1 -@@ -12,6 +21,15 @@ +@@ -12,6 +23,15 @@ # endif #endif diff --git a/src/3rdparty/zlib/src/gzguts.h b/src/3rdparty/zlib/src/gzguts.h index 20de7cb4ce..055de5100f 100644 --- a/src/3rdparty/zlib/src/gzguts.h +++ b/src/3rdparty/zlib/src/gzguts.h @@ -10,6 +10,8 @@ # 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) #endif #ifdef _LARGEFILE64_SOURCE |