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

[Alan Pope 🍺🐧🐱 🦄]

fix bug 1288885

[Nekhelesh Ramananthan (nik90)]

Surprisingly the ubuntu-clock-app.in file which when installed on the phone (by the click package) explicitly sets QT_SELECT=Qt5 which is why it still works on the phone properly. So I guess we needed to set this while running clock on the desktop as well.

lgtm!

review: Approve

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

PASSED: Continuous integration, rev:371
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/331/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1657
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-raring-amd64-ci/331
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-saucy-amd64-ci/331
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-trusty-amd64-ci/249

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

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-19 21:05:42 +0000
+++ CMakeLists.txt	2014-03-10 10:09:55 +0000
@@ -24,7 +24,7 @@
     set(CMAKE_INSTALL_BINDIR /)
     set(DATA_DIR /)
 	set(ICON ${ICON_FILE})
-    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	2014-02-18 21:11:37 +0000
+++ debian/changelog	2014-03-10 10:09:55 +0000
@@ -1,8 +1,9 @@
-ubuntu-clock-app (1.0ubuntu1) UNRELEASED; urgency=medium
+ubuntu-clock-app (1.0ubuntu2) UNRELEASED; urgency=medium
 
   * New icon
+  * Add -qt5 command line option (LP: #1288885)
 
- -- Alan Pope <[e-mail]>  Tue, 18 Feb 2014 21:11:01 +0000
+ -- Alan Pope <[e-mail]>  Mon, 10 Mar 2014 10:07:59 +0000
 
 ubuntu-clock-app (1.0) saucy; urgency=low