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>

diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 37d74b9..0b27015 100644 (file)
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -171,8 +171,6 @@ mac {
 DEFINES += QT_BUILDING_QT
 win32 {
     INCLUDEPATH += tmp
-    # ### QT_MAKEDLL is compatibility, remove before the Qt 5.0 release
-    !static: DEFINES+=QT_MAKEDLL
 }
 
 aix-g++* {

diff --git a/src/3rdparty/zlib/zlib.h b/src/3rdparty/zlib/zlib.h
index 4069724..5229707 100644 (file)
--- 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

diff --git a/src/gui/kernel/qgenericpluginfactory.cpp b/src/gui/kernel/qgenericpluginfactory.cpp
index b407823..3d294b3 100644 (file)
--- a/src/gui/kernel/qgenericpluginfactory.cpp
+++ b/src/gui/kernel/qgenericpluginfactory.cpp
@@ -48,7 +48,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#if !defined(Q_OS_WIN32) || defined(QT_MAKEDLL)
+#if !defined(Q_OS_WIN32) || defined(QT_SHARED)
 #ifndef QT_NO_LIBRARY
 
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
@@ -56,7 +56,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
      QLatin1String("/generic"), Qt::CaseInsensitive))
 
 #endif //QT_NO_LIBRARY
-#endif //QT_MAKEDLL
+#endif //QT_SHARED
 
 /*!
     \class QGenericPluginFactory
@@ -78,7 +78,7 @@ QObject *QGenericPluginFactory::create(const QString& key, const QString &specif
 {
     const QString driver = key.toLower();
 
-#if !defined(Q_OS_WIN32) || defined(QT_MAKEDLL)
+#if !defined(Q_OS_WIN32) || defined(QT_SHARED)
 #ifndef QT_NO_LIBRARY
     if (QObject *object = qLoadPlugin1<QObject, QGenericPlugin>(loader(), driver, specification))
         return object;
@@ -96,7 +96,7 @@ QStringList QGenericPluginFactory::keys()
 {
     QStringList list;
 
-#if !defined(Q_OS_WIN32) || defined(QT_MAKEDLL)
+#if !defined(Q_OS_WIN32) || defined(QT_SHARED)
 #ifndef QT_NO_LIBRARY
     typedef QMultiMap<int, QString> PluginKeyMap;
     typedef PluginKeyMap::const_iterator PluginKeyMapConstIterator;
@@ -107,7 +107,7 @@ QStringList QGenericPluginFactory::keys()
         if (!list.contains(it.value()))
             list += it.value();
 #endif //QT_NO_LIBRARY
-#endif //QT_MAKEDLL
+#endif
     return list;
 }