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

Proposed by Alexandre Abreu on 2015-01-14
Status: Merged
Approved by: Alexandre Abreu on 2015-01-14
Approved revision: 134
Merged at revision: 134
Proposed branch: lp:~abreu-alexandre/unity-webapps-qml/rtm-backport-sync-fixes
Merge into: lp:unity-webapps-qml/rtm-14.09
Diff against target: 38 lines (+9/-2)
1 file modified
src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp (+9/-2)
To merge this branch: bzr merge lp:~abreu-alexandre/unity-webapps-qml/rtm-backport-sync-fixes
Reviewer Review Type Date Requested Status
WebApps 2015-01-14 Pending
Review via email: mp+246460@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
19#include <QDir>19#include <QDir>
20#include <QDebug>20#include <QDebug>
21#include <QtCore/QTextStream>21#include <QtCore/QTextStream>
22#include <QtCore/QtGlobal>
2223
23#include "unity-webapps-app-model.h"24#include "unity-webapps-app-model.h"
24#include "unity-webapps-app-manifest-parser.h"25#include "unity-webapps-app-manifest-parser.h"
2526
26
27/*!27/*!
28 \qmltype UnityWebappsAppModel28 \qmltype UnityWebappsAppModel
29 \inqmlmodule Ubuntu.UnityWebApps 0.129 \inqmlmodule Ubuntu.UnityWebApps 0.1
@@ -56,7 +56,6 @@
56 paths, all other "values" are ignored.56 paths, all other "values" are ignored.
57*/57*/
5858
59
60// TODO add local folders59// TODO add local folders
61QString UnityWebappsAppModel::_commonScriptsDirName = "common";60QString UnityWebappsAppModel::_commonScriptsDirName = "common";
62QString UnityWebappsAppModel::_webappDirPrefix = "unity-webapps-";61QString UnityWebappsAppModel::_webappDirPrefix = "unity-webapps-";
@@ -77,6 +76,14 @@
77QString76QString
78UnityWebappsAppModel::getDefaultWebappsInstallationSearchPath()77UnityWebappsAppModel::getDefaultWebappsInstallationSearchPath()
79{78{
79 const char *WEBAPP_QML_DEFAULT_WEBAPPS_INSTALL_FOLDER_ENV_VAR =
80 "WEBAPP_QML_DEFAULT_WEBAPPS_INSTALL_FOLDER";
81 if (qEnvironmentVariableIsSet(
82 WEBAPP_QML_DEFAULT_WEBAPPS_INSTALL_FOLDER_ENV_VAR))
83 {
84 return QString::fromUtf8(
85 qgetenv(WEBAPP_QML_DEFAULT_WEBAPPS_INSTALL_FOLDER_ENV_VAR));
86 }
80 return "/usr/share/unity-webapps/userscripts";87 return "/usr/share/unity-webapps/userscripts";
81}88}
8289

Subscribers

People subscribed via source and target branches

to all changes: