Merge lp:~popey/music-app/fix-1288885 into lp:music-app/trusty

[Alan Pope 🍺🐧🐱 🦄]

fix lp:1288885

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

PASSED: Continuous integration, rev:373
http://91.189.93.70:8080/job/music-app-ci/637/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1656
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/637
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/639
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/358

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/637/rebuild

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

Looks good, but you'll need to resolve the merge conflict :(

review: Approve

[lp:~popey/music-app/fix-1288885]

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

resolve conflict

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

Put right what once went wrong

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

Once more unto the breach

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

PASSED: Continuous integration, rev:374
http://91.189.93.70:8080/job/music-app-ci/638/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1676
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/638
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/640
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/359

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/638/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-03-06 12:37:41 +0000
+++ CMakeLists.txt	2014-03-10 21:52:54 +0000
@@ -25,7 +25,7 @@
     set(CMAKE_INSTALL_BINDIR /)
     set(DATA_DIR /)
     set(ICON ${ICON_FILE})
-    set(EXEC "qmlscene ${MAIN_QML} --file=%f -I ./plugins")
+    set(EXEC "qmlscene -qt5 ${MAIN_QML} --file=%f -I ./plugins")
     set(DESKTOP_DIR ${DATA_DIR})
     set(URLS_DIR ${DATA_DIR})
 else(CLICK_MODE)

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-10 18:14:19 +0000
+++ debian/changelog	2014-03-10 21:52:54 +0000
@@ -8,6 +8,9 @@
   [ Dimitri John Ledkov ]
   * Use python 3 compatible mock import
 
+  [ Alan Pope ]
+  * Add -qt5 command line option [lp:#1288885]
+
   [ Victor Thompson ]
   * Add an autopilot test to test playing a song from the Artists tab. [lp:#1268455]
   * Remove duplicate quit in HUD and move back button so visible [lp:#1285838]