Merge lp:~abreu-alexandre/unity-webapps-qml/rtm-backport-sync-fixes into lp:unity-webapps-qml/rtm-14.09

[Alexandre Abreu]

Backport a testability improvement (webapps instrumentation) from trunk that allows some tests from external packages to run.

Backport a testability improvement (webapps instrumentation) from trunk that allows some tests from external packages to run.

=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp	2014-07-17 13:41:45 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp	2015-01-14 16:22:12 +0000
@@ -19,11 +19,11 @@
 #include <QDir>
 #include <QDebug>
 #include <QtCore/QTextStream>
+#include <QtCore/QtGlobal>
 
 #include "unity-webapps-app-model.h"
 #include "unity-webapps-app-manifest-parser.h"
 
-
 /*!
   \qmltype UnityWebappsAppModel
   \inqmlmodule Ubuntu.UnityWebApps 0.1
@@ -56,7 +56,6 @@
   paths, all other "values" are ignored.
 */
 
-
 // TODO add local folders
 QString UnityWebappsAppModel::_commonScriptsDirName = "common";
 QString UnityWebappsAppModel::_webappDirPrefix = "unity-webapps-";
@@ -77,6 +76,14 @@
 QString
 UnityWebappsAppModel::getDefaultWebappsInstallationSearchPath()
 {
+    const char *WEBAPP_QML_DEFAULT_WEBAPPS_INSTALL_FOLDER_ENV_VAR =
+            "WEBAPP_QML_DEFAULT_WEBAPPS_INSTALL_FOLDER";
+    if (qEnvironmentVariableIsSet(
+                WEBAPP_QML_DEFAULT_WEBAPPS_INSTALL_FOLDER_ENV_VAR))
+    {
+        return QString::fromUtf8(
+            qgetenv(WEBAPP_QML_DEFAULT_WEBAPPS_INSTALL_FOLDER_ENV_VAR));
+    }
     return "/usr/share/unity-webapps/userscripts";
 }