From 355bef74a30e5178ae361e6e1873d37b455d8dcb Mon Sep 17 00:00:00 2001 From: aavit Date: Mon, 10 Oct 2011 14:22:17 +0200 Subject: Fixes: libpng symbols exported from QtGui.dll on Windows The upgrade of the bundled libpng to version 1.5 had the side effect of causing the png functions to be exported from the QtGUi DLL when built with the MS Visual C++ compiler. Task-number: QTBUG-21455 Reviewed-by: Kim --- src/3rdparty/libpng/pngconf.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/3rdparty/libpng/pngconf.h b/src/3rdparty/libpng/pngconf.h index 2a41a29..b02f2a0 100644 --- a/src/3rdparty/libpng/pngconf.h +++ b/src/3rdparty/libpng/pngconf.h @@ -286,6 +286,11 @@ # endif # endif +/* Avoid exporting libpng symbols from Qt DLL on Windows */ +# if defined (_MSC_VER) && defined(PNG_IMPEXP) +# undef PNG_IMPEXP +# endif + # ifndef PNG_IMPEXP # define PNG_IMPEXP # endif -- cgit v0.12