Merge lp:~mzanetti/reminders-app/load-qml-from-usr into lp:reminders-app

[Michael Zanetti]

load qml file from /usr/share if not found in current dir

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

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

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

lgtm

review: Approve

[David Planella (dpm)]

Sorry to comment on an old MR, but I've just come across this one now. A quick question:

- Could /usr/share/reminders/ not be determined using QStandardPaths::DataLocation instead of being hardcoded?

[Michael Zanetti (mzanetti)]

Yeah... true. Well, I guess DataLocation points to /usr/share only. but yeah, would be better.

[David Planella (dpm)]

Not a big deal, I just came across the merge proposal and I thought I'd
mention it. If I understand it correctly, QStandardPaths::DataLocation
would point to /usr/share/reminders, whereas
QStandardPaths::GenericDataLocation would point to /usr/share

Cheers,
David.

On Wed, Mar 12, 2014 at 11:13 AM, Michael Zanetti <
<email address hidden>> wrote:

> Yeah... true. Well, I guess DataLocation points to /usr/share only. but
> yeah, would be better.
> --
>
> https://code.launchpad.net/~mzanetti/reminders-app/load-qml-from-usr/+merge/208088
> Your team Ubuntu Reminders app developers is subscribed to branch
> lp:reminders-app.
>

=== modified file 'src/app/main.cpp'
--- src/app/main.cpp	2014-02-19 00:07:09 +0000
+++ src/app/main.cpp	2014-02-25 09:47:08 +0000
@@ -84,7 +84,12 @@
     view.engine()->rootContext()->setContextProperty("accountPreference", &preferences);
 
     // load the qml file
-    view.setSource(QUrl::fromLocalFile("qml/reminders.qml"));
+    QFileInfo fi("qml/reminders.qml");
+    if (fi.exists()) {
+        view.setSource(QUrl::fromLocalFile("qml/reminders.qml"));
+    } else {
+        view.setSource(QUrl::fromLocalFile("/usr/share/reminders/qml/reminders.qml"));
+    }
 
     view.show();