From 4fb7eb0da74798205f5cac693c921065492fa33e Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Wed, 6 Jan 2016 12:18:40 +0100 Subject: Drop most "#ifndef QT_NO_LIBRARY" As we can load plugins without QLibrary now, we don't have to #ifdef out the code that does so anymore. Change-Id: I1dc20216830a882dbd5a1b431183407e6b19c837 Reviewed-by: Friedemann Kleint Reviewed-by: Thiago Macieira --- src/sql/kernel/qsqldatabase.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/sql/kernel') diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index 8841106c0f..62e1b6a7a5 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -99,11 +99,9 @@ QT_BEGIN_NAMESPACE -#ifndef QT_NO_LIBRARY Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QSqlDriverFactoryInterface_iid, QLatin1String("/sqldrivers"))) -#endif #if !defined(Q_CC_MSVC) || _MSC_VER >= 1900 // ### Qt6: remove the #ifdef @@ -577,7 +575,6 @@ QStringList QSqlDatabase::drivers() list << QLatin1String("QIBASE"); #endif -#ifndef QT_NO_LIBRARY if (QFactoryLoader *fl = loader()) { typedef QMultiMap PluginKeyMap; typedef PluginKeyMap::const_iterator PluginKeyMapConstIterator; @@ -588,7 +585,6 @@ QStringList QSqlDatabase::drivers() if (!list.contains(it.value())) list << it.value(); } -#endif DriverDict dict = QSqlDatabasePrivate::driverDict(); for (DriverDict::const_iterator i = dict.constBegin(); i != dict.constEnd(); ++i) { @@ -778,10 +774,8 @@ void QSqlDatabasePrivate::init(const QString &type) } } -#ifndef QT_NO_LIBRARY if (!driver && loader()) driver = qLoadPlugin(loader(), type); -#endif // QT_NO_LIBRARY if (!driver) { qWarning("QSqlDatabase: %s driver not loaded", type.toLatin1().data()); -- cgit v1.2.3