From 3a2b8fcaa52af48f89ecb95a942aad8ecbfde83a Mon Sep 17 00:00:00 2001
From: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Date: Fri, 16 Mar 2012 16:14:01 +1000
Subject: Use an environment variable to suppress loading of plugins.

This removes the last use of the sensors_unit_test_hook function
so it can be removed.

Change-Id: I9f0b27fc69bfe74a151826714e3a1c0e207a7e0c
Reviewed-by: Wolfgang Beck <wolfgang.beck@nokia.com>
---
 src/sensors/qsensormanager.cpp | 38 +++++++-------------------------------
 1 file changed, 7 insertions(+), 31 deletions(-)

(limited to 'src')

diff --git a/src/sensors/qsensormanager.cpp b/src/sensors/qsensormanager.cpp
index 67e5b44..7227380 100644
--- a/src/sensors/qsensormanager.cpp
+++ b/src/sensors/qsensormanager.cpp
@@ -70,9 +70,15 @@ public:
         , loader(new QFactoryLoader("com.nokia.Qt.QSensorPluginInterface/1.0", QLatin1String("/sensors")))
         , defaultIdentifierForTypeLoaded(false)
         , sensorsChanged(false)
+        , loadExternalPlugins(true)
     {
+        QByteArray env = qgetenv("QT_SENSORS_LOAD_PLUGINS");
+        if (env == "0") {
+            loadExternalPlugins = false;
+        }
     }
 
+    bool loadExternalPlugins;
     PluginLoadingState pluginLoadingState;
     QFactoryLoader *loader;
     void loadPlugins();
@@ -129,36 +135,6 @@ public Q_SLOTS:
 
 Q_GLOBAL_STATIC(QSensorManagerPrivate, sensorManagerPrivate)
 
-// The unit test needs to change the behaviour of the library. It does this
-// through an exported but undocumented function.
-static void initPlugin(QObject *plugin);
-static bool load_external_plugins = true;
-Q_SENSORS_EXPORT void sensors_unit_test_hook(int index)
-{
-    QSensorManagerPrivate *d = sensorManagerPrivate();
-
-    switch (index) {
-    case 0:
-        Q_ASSERT(d->pluginLoadingState == QSensorManagerPrivate::NotLoaded);
-        load_external_plugins = false;
-        break;
-    case 1:
-    {
-        Q_ASSERT(load_external_plugins == false);
-        Q_ASSERT(d->pluginLoadingState == QSensorManagerPrivate::Loaded);
-        SENSORLOG() << "initializing plugins";
-        QList<QJsonObject> meta = d->loader->metaData();
-        for (int i = 0; i < meta.count(); i++) {
-            QObject *plugin = d->loader->instance(i);
-            initPlugin(plugin);
-        }
-        break;
-    }
-    default:
-        break;
-    }
-}
-
 static void initPlugin(QObject *o)
 {
     if (!o) return;
@@ -191,7 +167,7 @@ void QSensorManagerPrivate::loadPlugins()
         initPlugin(plugin);
     }
 
-    if (load_external_plugins) {
+    if (d->loadExternalPlugins) {
         SENSORLOG() << "initializing plugins";
         QList<QJsonObject> meta = d->loader->metaData();
         for (int i = 0; i < meta.count(); i++) {
-- 
cgit v1.2.1