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

Status: Merged
Approved by: Nekhelesh Ramananthan on 2014-03-10
Approved revision: 371
Merged at revision: 370
Proposed branch: lp:~popey/ubuntu-clock-app/fix-1288885
Merge into: lp:ubuntu-clock-app/saucy
Diff against target: 27 lines (+4/-3)
2 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+3/-2)
To merge this branch: bzr merge lp:~popey/ubuntu-clock-app/fix-1288885
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2014-03-10
Nekhelesh Ramananthan 2014-03-10 Approve on 2014-03-10
Review via email: mp+210171@code.launchpad.net

Commit message

To post a comment you must log in.
Nekhelesh Ramananthan (nik90) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
24 set(CMAKE_INSTALL_BINDIR /)24 set(CMAKE_INSTALL_BINDIR /)
25 set(DATA_DIR /)25 set(DATA_DIR /)
26 set(ICON ${ICON_FILE})26 set(ICON ${ICON_FILE})
27 set(EXEC "qmlscene ${MAIN_QML}")27 set(EXEC "qmlscene -qt5 ${MAIN_QML}")
28 set(DESKTOP_DIR ${DATA_DIR})28 set(DESKTOP_DIR ${DATA_DIR})
29 set(URLS_DIR ${DATA_DIR})29 set(URLS_DIR ${DATA_DIR})
30else(CLICK_MODE)30else(CLICK_MODE)
3131
=== 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 @@
1ubuntu-clock-app (1.0ubuntu1) UNRELEASED; urgency=medium1ubuntu-clock-app (1.0ubuntu2) UNRELEASED; urgency=medium
22
3 * New icon3 * New icon
4 * Add -qt5 command line option (LP: #1288885)
45
5 -- Alan Pope <alan.pope@canonical.com> Tue, 18 Feb 2014 21:11:01 +00006 -- Alan Pope <popey@ubuntu.com> Mon, 10 Mar 2014 10:07:59 +0000
67
7ubuntu-clock-app (1.0) saucy; urgency=low8ubuntu-clock-app (1.0) saucy; urgency=low
89

Subscribers

People subscribed via source and target branches