Merge lp:~popey/ubuntu-calculator-app/fix-1288885 into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

Status: Merged
Approved by: Riccardo Padovani on 2014-03-10
Approved revision: 229
Merged at revision: 230
Proposed branch: lp:~popey/ubuntu-calculator-app/fix-1288885
Merge into: lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk
Diff against target: 31 lines (+4/-3)
2 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+3/-2)
To merge this branch: bzr merge lp:~popey/ubuntu-calculator-app/fix-1288885
Reviewer Review Type Date Requested Status
Riccardo Padovani 2014-03-10 Approve on 2014-03-10
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2014-03-10
Review via email: mp+210172@code.launchpad.net

Commit message

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-02-18 21:00:33 +0000
3+++ CMakeLists.txt 2014-03-10 10:13:02 +0000
4@@ -22,7 +22,7 @@
5 set(CMAKE_INSTALL_PREFIX /)
6 set(CMAKE_INSTALL_BINDIR /)
7 set(DATA_DIR /)
8- set(EXEC "qmlscene ${MAIN_QML}")
9+ set(EXEC "qmlscene -qt5 ${MAIN_QML}")
10 set(DESKTOP_DIR ${DATA_DIR})
11 else(CLICK_MODE)
12 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2014-02-18 21:00:33 +0000
16+++ debian/changelog 2014-03-10 10:13:02 +0000
17@@ -1,12 +1,13 @@
18-ubuntu-calculator-app (0.1.3ubuntu2) UNRELEASED; urgency=medium
19+ubuntu-calculator-app (0.1.3ubuntu3) UNRELEASED; urgency=medium
20
21 [ Sergio Schvezov ]
22 * Adding cmake
23
24 [ Alan Pope ]
25 * Update icon
26+ * Add -qt5 command line option (LP: #1288885)
27
28- -- Alan Pope <alan.pope@canonical.com> Tue, 18 Feb 2014 20:59:45 +0000
29+ -- Alan Pope <popey@ubuntu.com> Mon, 10 Mar 2014 10:12:03 +0000
30
31 ubuntu-calculator-app (0.1.3) raring; urgency=low
32

Subscribers

People subscribed via source and target branches