notes-app

Merge lp:~bfiller/notes-app/fix-exec-path into lp:notes-app

  1. fix-exec-path
  2. Merge into trunk
Proposed by Bill Filler
Status: Merged
Merged at revision: 258
Proposed branch: lp:~bfiller/notes-app/fix-exec-path
Merge into: lp:notes-app
Diff against target: 12 lines (+1/-1)
1 file modified
CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~bfiller/notes-app/fix-exec-path
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Alan Pope 🍺🐧🐱 🦄 (community) Approve
Review via email: mp+215914@code.launchpad.net

Commit message

add -qt5 to fix desktop launching

Description of the change

add -qt5 to fix desktop launching

To post a comment you must log in.
Revision history for this message
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Looks good to me.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:258
http://jenkins.qa.ubuntu.com/job/notes-app-ci/296/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4853
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-amd64-ci/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-ci/78
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-armhf-ci/78/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-trusty-i386-ci/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4193
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4991
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4991/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4428
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4428/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6406
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/6053

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/notes-app-ci/296/rebuild

review: Approve (continuous-integration)

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 2013-10-08 22:42:33 +0000
3+++ CMakeLists.txt 2014-04-15 16:05:04 +0000
4@@ -46,7 +46,7 @@
5 set(NOTES_APP_DIR ${CMAKE_INSTALL_DATADIR}/${NOTES_APP})
6 set(DESKTOP_PATH "Path=${CMAKE_INSTALL_FULL_DATADIR}/${NOTES_APP}")
7 set(DESKTOP_EXEC
8- "qmlscene ${CMAKE_INSTALL_FULL_DATADIR}/${NOTES_APP}/NotesApp.qml")
9+ "qmlscene -qt5 ${CMAKE_INSTALL_FULL_DATADIR}/${NOTES_APP}/NotesApp.qml")
10 else(NOT CLICK_MODE)
11 set(NOTES_APP_DIR "/")
12 set(DESKTOP_PATH "")

Subscribers

People subscribed via source and target branches