Merge lp:~gerlowskija/reminders-app/app-dir-standard-path into lp:reminders-app

Proposed by Jason
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 107
Merged at revision: 108
Proposed branch: lp:~gerlowskija/reminders-app/app-dir-standard-path
Merge into: lp:reminders-app
Diff against target: 11 lines (+1/-0)
1 file modified
src/app/main.cpp (+1/-0)
To merge this branch: bzr merge lp:~gerlowskija/reminders-app/app-dir-standard-path
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Jason (community) Approve
David Planella Approve
Review via email: mp+217262@code.launchpad.net

Commit message

Appends the correct path to the list of "Standard Paths" used to search for the qml file.

Description of the change

On Desktop, launching the Reminders App through the Ubuntu SDK was failing with the error: "File qml/reminders.qml not found at any of the Standard Paths".

dpm suggested this line in main.cpp which appends the correct path to the list of "Standard Paths" used to search for the qml file.

With the change, I am able to launch the app through the SDK on my desktop machine.

To post a comment you must log in.
Revision history for this message
David Planella (dpm) wrote :

Looks good to me, thanks for the fix!

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~gerlowskija/reminders-app/app-dir-standard-path/+merge/217262/+edit-commit-message

review: Needs Fixing (continuous-integration)
Revision history for this message
Jason (gerlowskija) wrote :

Added a commit message for the branch.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/main.cpp'
2--- src/app/main.cpp 2014-04-09 13:29:27 +0000
3+++ src/app/main.cpp 2014-04-25 15:31:31 +0000
4@@ -105,6 +105,7 @@
5 const QString filePath = QLatin1String("qml/reminders.qml");
6 QStringList paths = QStandardPaths::standardLocations(QStandardPaths::DataLocation);
7 paths.prepend(QDir::currentPath());
8+ paths.prepend(QCoreApplication::applicationDirPath());
9 Q_FOREACH (const QString &path, paths) {
10 QString myPath = path + QLatin1Char('/') + filePath;
11 if (QFile::exists(myPath)) {

Subscribers

People subscribed via source and target branches