summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2012-09-10 17:19:08 +0200
committerQt by Nokia <qt-info@nokia.com>2012-09-11 17:26:36 +0200
commitbe59a645fbec72a92ddcf261d055e3f756081b07 (patch)
tree153c95c9e1fd20005127ea63496256d8779a9e82 /src
parentfc4d3f37f59cfecc9987383bc7718d31541080b8 (diff)
downloadqtsvg-be59a645fbec72a92ddcf261d055e3f756081b07.tar.gz
remove usage of QT_MAKEDLL from QtSvg
Change-Id: I14170ebcf4605604c514f126bfa021208d49012d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/zlib/zlib.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/zlib/zlib.h b/src/3rdparty/zlib/zlib.h
index 4069724..5229707 100644
--- a/src/3rdparty/zlib/zlib.h
+++ b/src/3rdparty/zlib/zlib.h
@@ -33,13 +33,13 @@
#include "zconf.h"
-#include "qconfig.h"
+#include <qglobal.h>
#if defined(QT_VISIBILITY_AVAILABLE)
# undef ZEXTERN
# define ZEXTERN __attribute__((visibility("default")))
-#elif defined(QT_MAKEDLL)
+#else
# undef ZEXTERN
-# define ZEXTERN __declspec(dllexport)
+# define ZEXTERN Q_DECL_EXPORT
#endif
#ifdef __cplusplus