Merge lp:~popey/ubuntu-filemanager-app/fix-1288885 into lp:ubuntu-filemanager-app

[Alan Pope 🍺🐧🐱 🦄]

fix lp:1288885

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

PASSED: Continuous integration, rev:138
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/139/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1655
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-ci/139
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-ci/139
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-ci/89

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/139/rebuild

review: Approve (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-autolanding/48/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1792
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-raring-amd64-autolanding/48
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-saucy-amd64-autolanding/48
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-trusty-amd64-autolanding/35

review: Needs Fixing (continuous-integration)

[Alan Pope 🍺🐧🐱 🦄 (popey)]

review: Approve

[David Planella (dpm)]

Thanks for the fix. This has now been addressed differently in trunk: the app now builds the plugin and it is started by an executable instead of using qmlscene.

review: Disapprove

Unmerged revisions

138. By Alan Pope 🍺🐧🐱 🦄 on 2014-03-10

fix bug 1288885

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-19 00:00:15 +0000
+++ CMakeLists.txt	2014-03-10 10:15:57 +0000
@@ -23,7 +23,7 @@
     set(CMAKE_INSTALL_PREFIX /)
     set(CMAKE_INSTALL_BINDIR /)
     set(DATA_DIR /)
-    set(EXEC "qmlscene ${MAIN_QML}")
+    set(EXEC "qmlscene -qt5 ${MAIN_QML}")
     set(DESKTOP_DIR ${DATA_DIR})
     set(URLS_DIR ${DATA_DIR})
 else(CLICK_MODE)
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-04-19 20:30:19 +0000
+++ debian/changelog	2014-03-10 10:15:57 +0000
@@ -1,3 +1,9 @@
+ubuntu-filemanager-app (0.1.1ubuntu1) UNRELEASED; urgency=medium
+
+  * Add -qt5 command line option (LP: #1288885)  
+
+ -- Alan Pope <[e-mail]>  Mon, 10 Mar 2014 10:14:49 +0000
+
 ubuntu-filemanager-app (0.1.1) raring; urgency=low
 
   * Initial release