summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraavit <qt_aavit@ovi.com>2011-11-15 09:13:46 +0100
committerQt by Nokia <qt-info@nokia.com>2011-11-16 14:03:02 +0100
commit041e32d6e12f71f1438a0bd0d8a85306dbac8163 (patch)
treef39e2990094fc8886028d3d19b14a73563fd10aa
parent91af3336344548d7540a3e6296879d7132eb0c55 (diff)
Fixes: unwanted gcc export of symbols from bundled libpng
This removes a change to libpng that was only relevant for building a certain Qt 4 tool in certain environements without system libpng. This is no longer relevant, so this kludge should now be removed. Change-Id: I9a04ab0224f9e84ccab3ec27762582be439fe3ef Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
-rw-r--r--src/3rdparty/libpng/pngconf.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/3rdparty/libpng/pngconf.h b/src/3rdparty/libpng/pngconf.h
index d0b34549cb..dd7ebba10d 100644
--- a/src/3rdparty/libpng/pngconf.h
+++ b/src/3rdparty/libpng/pngconf.h
@@ -277,13 +277,6 @@
# endif
# endif
-# if !defined(PNG_IMPEXP)
-# include <qconfig.h>
-# if defined(QT_VISIBILITY_AVAILABLE)
-# define PNG_IMPEXP __attribute__((visibility("default")))
-# endif
-# endif
-
# ifndef PNG_IMPEXP
# define PNG_IMPEXP
# endif