From 26b6cce44bc4fb81b09420bdaf56fc6036d1eece Mon Sep 17 00:00:00 2001 From: Joerg Bornemann 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 Reviewed-by: Oswald Buddenhagen --- src/gui/kernel/qgenericpluginfactory.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gui/kernel/qgenericpluginfactory.cpp') diff --git a/src/gui/kernel/qgenericpluginfactory.cpp b/src/gui/kernel/qgenericpluginfactory.cpp index b407823a75..3d294b34a2 100644 --- 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(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 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; } -- cgit v1.2.3