diff options
| author | aavit <qt-info@nokia.com> | 2011-10-10 12:22:17 (GMT) |
|---|---|---|
| committer | Qt Commercial Integration <QtCommercial@digia.com> | 2012-01-31 10:25:08 (GMT) |
| commit | 22e22fffd4acbb7ea844738b1ce06c1ba4afe012 (patch) | |
| tree | fea96a18a6abab3b4c5f57bbafd32f26488222ef /src | |
| parent | 78043b57ac50a399222221fb8fad2a47ff90a10c (diff) | |
| download | Qt-22e22fffd4acbb7ea844738b1ce06c1ba4afe012.zip Qt-22e22fffd4acbb7ea844738b1ce06c1ba4afe012.tar.gz Qt-22e22fffd4acbb7ea844738b1ce06c1ba4afe012.tar.bz2 | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/libpng/pngconf.h | 5 |
1 files changed, 5 insertions, 0 deletions
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 |