AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove usage of QT_MAKEDLL in favor of the new QT_STATIC macro

Browse Source 
Change-Id: I411cab0d92a8cad6b4f3676afe5cee050c4b789b
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Joerg Bornemann 2012-09-10 17:21:04 +02:00 committed by Qt by Nokia
parent d4170585f0
commit 26b6cce44b
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/qt_module.prf
View File

@ -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++* {

6
src/3rdparty/zlib/zlib.h vendored
View File

@ -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

10
src/gui/kernel/qgenericpluginfactory.cpp
View File

@ -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;
}