diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-10 13:38:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-10-10 13:38:02 (GMT) |
| commit | 22d7b6c1afb3e8558941052b09f755cceb0a46fd (patch) | |
| tree | 9e9a09f2fdbce16500f99a09ee286c82785d3aa3 /src/3rdparty | |
| parent | 95e5e8ff45d2aa8acda595186136b54f695bb9cb (diff) | |
| parent | e9712d60c6e40c2b81b10611a3573c4638121a85 (diff) | |
| download | Qt-22d7b6c1afb3e8558941052b09f755cceb0a46fd.zip Qt-22d7b6c1afb3e8558941052b09f755cceb0a46fd.tar.gz Qt-22d7b6c1afb3e8558941052b09f755cceb0a46fd.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging:
Fixes: libpng symbols exported from QtGui.dll on Windows
omit unassigned (and too recent codepoints) from the text Normalization process
Fixed broken window surface flush when depth is 24 and bpp is not 32.
Diffstat (limited to 'src/3rdparty')
| -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 |