Merge lp:~dpm/reminders-app/fix-1303763 into lp:reminders-app

[David Planella]

Adds the launch path to those searched for when looking for the main QML file, so that the app can start.

Adds the launch path to those searched for when looking for the main QML file, so that the app can start.

[lp:~dpm/reminders-app/fix-1303763]

107. By David Planella on 2014-04-09

No need to re-bump the version number

[Michael Zanetti (mzanetti)]

Hmm... I think the change that introduced the applicationPath() also changed autopilot to rely on that. I think we should probably keep that too.

[Michael Zanetti (mzanetti)]

clarified on IRC. seems allright.

review: Approve

[David Planella (dpm)]

Good point. Checked that and running 'autopilot run reminders' from the tests/autopilot directory, and that seemed to work well. I.e. it ran successfully the one test we have.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:107
http://91.189.93.70:8080/job/reminders-app-ci/256/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2015/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/256/console
    FAILURE: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/256/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/256/rebuild

review: Needs Fixing (continuous-integration)

[Leo Arias (elopio)]

review: Approve (tried the new package)

[lp:~dpm/reminders-app/fix-1303763]

108. By David Planella on 2014-04-09

Merged prerequisite branch changes to fix Debian packaging and allow Jenkins to build packages

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:108
http://91.189.93.70:8080/job/reminders-app-ci/259/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2020
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/259
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/259

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/259/rebuild

review: Approve (continuous-integration)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:108
http://91.189.93.70:8080/job/reminders-app-ci/260/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2093
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/260
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/260

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/260/rebuild

review: Approve (continuous-integration)

=== modified file 'manifest.json'
--- manifest.json	2014-04-09 20:01:58 +0000
+++ manifest.json	2014-04-09 20:01:58 +0000
@@ -19,4 +19,4 @@
     "x-test": {
         "autopilot": "reminders"
     }
-}
 \ No newline at end of file
+}
 
=== modified file 'src/app/main.cpp'
--- src/app/main.cpp	2014-04-01 10:38:24 +0000
+++ src/app/main.cpp	2014-04-09 20:01:58 +0000
@@ -27,6 +27,7 @@
 #include <QtQuick/QQuickView>
 #include <QtQml/QtQml>
 #include <QLibrary>
+#include <QDir>
 
 #include <QDebug>
 
@@ -103,7 +104,7 @@
     QString qmlfile;
     const QString filePath = QLatin1String("qml/reminders.qml");
     QStringList paths = QStandardPaths::standardLocations(QStandardPaths::DataLocation);
-    paths.prepend(QCoreApplication::applicationDirPath());
+    paths.prepend(QDir::currentPath());
     Q_FOREACH (const QString &path, paths) {
         QString myPath = path + QLatin1Char('/') + filePath;
         if (QFile::exists(myPath)) {