From 26b6cce44bc4fb81b09420bdaf56fc6036d1eece Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
Date: Mon, 10 Sep 2012 17:21:04 +0200
Subject: remove usage of QT_MAKEDLL in favor of the new QT_STATIC macro

Change-Id: I411cab0d92a8cad6b4f3676afe5cee050c4b789b
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 src/3rdparty/zlib/zlib.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/3rdparty/zlib')

diff --git a/src/3rdparty/zlib/zlib.h b/src/3rdparty/zlib/zlib.h
index 4069724c9f..5229707f52 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
-- 
cgit v1.2.3