diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:17:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-21 08:17:21 +0100 |
| commit | 158a3a4159bdc5a49caecd63e021dacbc06cf23c (patch) | |
| tree | c3ed9aee6cabd46e5e8615b3815b92d32857c4da /src/3rdparty/libpng/qtpatches.diff | |
| parent | 26ece94a68fb5ae680c5639716b06c4e1ae979a8 (diff) | |
| parent | 7b2fb038ae4b8b9231ae989ad309b6eca107a858 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/io/qiodevice_p.h
src/corelib/kernel/qvariant_p.h
src/corelib/tools/qsimd.cpp
src/gui/kernel/qguiapplication.cpp
tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
Change-Id: I742a093cbb231b282b43e463ec67173e0d29f57a
Diffstat (limited to 'src/3rdparty/libpng/qtpatches.diff')
| -rw-r--r-- | src/3rdparty/libpng/qtpatches.diff | 37 |
1 files changed, 4 insertions, 33 deletions
diff --git a/src/3rdparty/libpng/qtpatches.diff b/src/3rdparty/libpng/qtpatches.diff index 1fb9b3f0c0..82ee104545 100644 --- a/src/3rdparty/libpng/qtpatches.diff +++ b/src/3rdparty/libpng/qtpatches.diff @@ -1,34 +1,5 @@ -diff --git a/src/3rdparty/libpng/pnglibconf.h b/src/3rdparty/libpng/pnglibconf.h -index b4ec3c3..f0fdcf8 100644 ---- a/src/3rdparty/libpng/pnglibconf.h -+++ b/src/3rdparty/libpng/pnglibconf.h -@@ -27,7 +27,9 @@ - #define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED - #define PNG_COLORSPACE_SUPPORTED - #define PNG_CONSOLE_IO_SUPPORTED -+#ifndef _WIN32_WCE - #define PNG_CONVERT_tIME_SUPPORTED -+#endif - #define PNG_EASY_ACCESS_SUPPORTED - /*#undef PNG_ERROR_NUMBERS_SUPPORTED*/ - #define PNG_ERROR_TEXT_SUPPORTED -@@ -106,12 +108,14 @@ - #define PNG_SET_OPTION_SUPPORTED - #define PNG_SET_UNKNOWN_CHUNKS_SUPPORTED - #define PNG_SET_USER_LIMITS_SUPPORTED -+#ifndef _WIN32_WCE - #define PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED - #define PNG_SIMPLIFIED_READ_BGR_SUPPORTED - #define PNG_SIMPLIFIED_READ_SUPPORTED - #define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED - #define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED - #define PNG_SIMPLIFIED_WRITE_SUPPORTED -+#endif - #define PNG_STDIO_SUPPORTED - #define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED - #define PNG_TEXT_SUPPORTED diff --git a/src/3rdparty/libpng/pngpriv.h b/src/3rdparty/libpng/pngpriv.h -index 5980a3f..7185444 100644 +index c466d4b..f7a4547 100644 --- a/src/3rdparty/libpng/pngpriv.h +++ b/src/3rdparty/libpng/pngpriv.h @@ -23,6 +23,12 @@ @@ -44,7 +15,7 @@ index 5980a3f..7185444 100644 /* Feature Test Macros. The following are defined here to ensure that correctly * implemented libraries reveal the APIs libpng needs to build and hide those * that are not needed and potentially damaging to the compilation. -@@ -215,6 +221,11 @@ +@@ -219,6 +225,11 @@ # endif #endif /* Setting PNG_BUILD_DLL if required */ @@ -56,7 +27,7 @@ index 5980a3f..7185444 100644 /* See pngconf.h for more details: the builder of the library may set this on * the command line to the right thing for the specific compilation system or it * may be automagically set above (at present we know of no system where it does -@@ -426,6 +437,9 @@ +@@ -447,6 +458,9 @@ #if defined(WIN32) || defined(_Windows) || defined(_WINDOWS) || \ defined(_WIN32) || defined(__WIN32__) # include <windows.h> /* defines _WINDOWS_ macro */ @@ -66,7 +37,7 @@ index 5980a3f..7185444 100644 #endif #endif /* PNG_VERSION_INFO_ONLY */ -@@ -436,7 +450,7 @@ +@@ -457,7 +471,7 @@ /* Memory model/platform independent fns */ #ifndef PNG_ABORT |