Merge branch 'envvar' into 'master'

Use envvar for library paths This fixes sensorfwd when used in a confinement environment. See merge request !5
sailfishos · Nov 20, 2016 · 493af37 · 493af37
2 parents d361752 + a10df5b
commit 493af37
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/core/loader.cpp b/core/loader.cpp
@@ -54,7 +54,13 @@ bool Loader::loadPluginFile(const QString& name, QString *errorString, QStringLi
 #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     QString pluginPath = QString::fromLatin1("/usr/lib/sensord/lib%1.so").arg(name);
 #else
-    QString pluginPath = QString::fromLatin1("/usr/lib/sensord-qt5/lib%1-qt5.so").arg(name);
+    QString pluginPath;
+    QByteArray env = qgetenv("SENSORFW_LIBRARY_PATH");
+    if (env.isEmpty())
+        pluginPath = QString::fromLatin1("/usr/lib/sensord-qt5/lib%1-qt5.so").arg(name);
+    else
+        pluginPath = QString::fromLatin1(env+"/usr/lib/sensord-qt5/lib%1-qt5.so").arg(name);
+
 #endif
 
     QPluginLoader qpl(pluginPath);

diff --git a/core/sensormanager.cpp b/core/sensormanager.cpp
@@ -108,7 +108,13 @@ SensorManager::SensorManager()
     pipeNotifier_(0),
     deviation(0)
 {
-    const char* SOCKET_NAME = "/var/run/sensord.sock";
+    QString pluginPath;
+    QByteArray env = qgetenv("SENSORFW_LIBRARY_PATH");
+    const char* SOCKET_NAME;
+    if (env.isEmpty())
+        SOCKET_NAME = "/var/run/sensord.sock";
+    else
+        SOCKET_NAME = env+"/var/run/sensord.sock";
 
     new SensorManagerAdaptor(this);