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

Status: Rejected
Rejected by: David Planella on 2014-04-15
Proposed branch: lp:~popey/ubuntu-filemanager-app/fix-1288885
Merge into: lp:ubuntu-filemanager-app
Diff against target: 26 lines (+7/-1)
2 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~popey/ubuntu-filemanager-app/fix-1288885
Reviewer Review Type Date Requested Status
David Planella Disapprove on 2014-04-15
Alan Pope 🍺🐧🐱 πŸ¦„ Approve on 2014-04-01
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing on 2014-03-18
Review via email: mp+210173@code.launchpad.net

Commit message

To post a comment you must log in.
David Planella (dpm) wrote :

Thanks for the fix. This has now been addressed differently in trunk: the app now builds the plugin and it is started by an executable instead of using qmlscene.

review: Disapprove

Unmerged revisions

138. By Alan Pope 🍺🐧🐱 πŸ¦„ on 2014-03-10

fix bug 1288885

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-19 00:00:15 +0000
3+++ CMakeLists.txt 2014-03-10 10:15:57 +0000
4@@ -23,7 +23,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 set(URLS_DIR ${DATA_DIR})
12 else(CLICK_MODE)
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2013-04-19 20:30:19 +0000
16+++ debian/changelog 2014-03-10 10:15:57 +0000
17@@ -1,3 +1,9 @@
18+ubuntu-filemanager-app (0.1.1ubuntu1) UNRELEASED; urgency=medium
19+
20+ * Add -qt5 command line option (LP: #1288885)
21+
22+ -- Alan Pope <popey@ubuntu.com> Mon, 10 Mar 2014 10:14:49 +0000
23+
24 ubuntu-filemanager-app (0.1.1) raring; urgency=low
25
26 * Initial release

Subscribers

People subscribed via source and target branches