1diff --git a/src/3rdparty/libpng/pngpriv.h b/src/3rdparty/libpng/pngpriv.h 2index 583c26f9bd..2ab9b70d73 100644 3--- a/src/3rdparty/libpng/pngpriv.h 4+++ b/src/3rdparty/libpng/pngpriv.h 5@@ -23,6 +23,12 @@ 6 #ifndef PNGPRIV_H 7 #define PNGPRIV_H 8 9+#ifdef _MSC_VER 10+# ifndef _CRT_SECURE_NO_DEPRECATE 11+# define _CRT_SECURE_NO_DEPRECATE 12+# endif 13+#endif 14+ 15 /* Feature Test Macros. The following are defined here to ensure that correctly 16 * implemented libraries reveal the APIs libpng needs to build and hide those 17 * that are not needed and potentially damaging to the compilation. 18@@ -308,6 +314,11 @@ 19 # endif 20 #endif /* Setting PNG_BUILD_DLL if required */ 21 22+/* Modfied for usage in Qt: Do not export the libpng APIs */ 23+#ifdef PNG_BUILD_DLL 24+#undef PNG_BUILD_DLL 25+#endif 26+ 27 /* See pngconf.h for more details: the builder of the library may set this on 28 * the command line to the right thing for the specific compilation system or it 29 * may be automagically set above (at present we know of no system where it does 30@@ -546,6 +557,9 @@ 31 #if defined(WIN32) || defined(_Windows) || defined(_WINDOWS) || \ 32 defined(_WIN32) || defined(__WIN32__) 33 # include <windows.h> /* defines _WINDOWS_ macro */ 34+# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP) 35+# define _WINRT_ /* Define a macro for Windows Runtime builds */ 36+# endif 37 #endif 38 #endif /* PNG_VERSION_INFO_ONLY */ 39 40@@ -556,7 +570,7 @@ 41 42 /* Memory model/platform independent fns */ 43 #ifndef PNG_ABORT 44-# ifdef _WINDOWS_ 45+# if (defined(_WINDOWS_) || defined(_WIN32_WCE)) && !defined(_WINRT_) 46 # define PNG_ABORT() ExitProcess(0) 47 # else 48 # define PNG_ABORT() abort() 49