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

Status: Merged
Approved by: Andrew Hayzen on 2014-03-10
Approved revision: 376
Merged at revision: 374
Proposed branch: lp:~popey/music-app/fix-1288885
Merge into: lp:music-app/trusty
Diff against target: 26 lines (+4/-1)
2 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+3/-0)
To merge this branch: bzr merge lp:~popey/music-app/fix-1288885
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2014-03-10
Andrew Hayzen 2014-03-10 Approve on 2014-03-10
Review via email: mp+210175@code.launchpad.net

Commit message

To post a comment you must log in.
Andrew Hayzen (ahayzen) wrote :

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

review: Approve
lp:~popey/music-app/fix-1288885 updated on 2014-03-10
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

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-03-06 12:37:41 +0000
3+++ CMakeLists.txt 2014-03-10 21:52:54 +0000
4@@ -25,7 +25,7 @@
5 set(CMAKE_INSTALL_BINDIR /)
6 set(DATA_DIR /)
7 set(ICON ${ICON_FILE})
8- set(EXEC "qmlscene ${MAIN_QML} --file=%f -I ./plugins")
9+ set(EXEC "qmlscene -qt5 ${MAIN_QML} --file=%f -I ./plugins")
10 set(DESKTOP_DIR ${DATA_DIR})
11 set(URLS_DIR ${DATA_DIR})
12 else(CLICK_MODE)
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2014-03-10 18:14:19 +0000
16+++ debian/changelog 2014-03-10 21:52:54 +0000
17@@ -8,6 +8,9 @@
18 [ Dimitri John Ledkov ]
19 * Use python 3 compatible mock import
20
21+ [ Alan Pope ]
22+ * Add -qt5 command line option [lp:#1288885]
23+
24 [ Victor Thompson ]
25 * Add an autopilot test to test playing a song from the Artists tab. [lp:#1268455]
26 * Remove duplicate quit in HUD and move back button so visible [lp:#1285838]

Subscribers

People subscribed via source and target branches

to status/vote changes: