From 4fb7eb0da74798205f5cac693c921065492fa33e Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
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 <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 .../xcb/gl_integrations/qxcbglintegrationfactory.cpp      | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

(limited to 'src/plugins/platforms/xcb/gl_integrations')

diff --git a/src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationfactory.cpp b/src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationfactory.cpp
index f0bd930ca6..8e1688dbe8 100644
--- a/src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationfactory.cpp
+++ b/src/plugins/platforms/xcb/gl_integrations/qxcbglintegrationfactory.cpp
@@ -47,17 +47,18 @@
 
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QXcbGlIntegrationFactoryInterface_iid, QLatin1String("/xcbglintegrations"), Qt::CaseInsensitive))
+
+#ifndef QT_NO_LIBRARY
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader,
                           (QXcbGlIntegrationFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive))
 #endif // !QT_NO_LIBRARY
 
 QStringList QXcbGlIntegrationFactory::keys(const QString &pluginPath)
 {
-#ifndef QT_NO_LIBRARY
     QStringList list;
+#ifndef QT_NO_LIBRARY
     if (!pluginPath.isEmpty()) {
         QCoreApplication::addLibraryPath(pluginPath);
         list = directLoader()->keyMap().values();
@@ -70,12 +71,11 @@ QStringList QXcbGlIntegrationFactory::keys(const QString &pluginPath)
                 (*it).append(postFix);
         }
     }
-    list.append(loader()->keyMap().values());
-    return list;
 #else
     Q_UNUSED(pluginPath);
-    return QStringList();
 #endif
+    list.append(loader()->keyMap().values());
+    return list;
 }
 
 QXcbGlIntegration *QXcbGlIntegrationFactory::create(const QString &platform, const QString &pluginPath)
@@ -87,13 +87,10 @@ QXcbGlIntegration *QXcbGlIntegrationFactory::create(const QString &platform, con
         if (QXcbGlIntegration *ret = qLoadPlugin<QXcbGlIntegration, QXcbGlIntegrationPlugin>(directLoader(), platform))
             return ret;
     }
-    if (QXcbGlIntegration *ret = qLoadPlugin<QXcbGlIntegration, QXcbGlIntegrationPlugin>(loader(), platform))
-        return ret;
 #else
-    Q_UNUSED(platform);
     Q_UNUSED(pluginPath);
 #endif
-    return Q_NULLPTR;
+    return qLoadPlugin<QXcbGlIntegration, QXcbGlIntegrationPlugin>(loader(), platform);
 }
 
 QT_END_NAMESPACE
-- 
cgit v1.2.3