notes-app

Merge lp://qastaging/~zeller-benjamin/notes-app/sdkcompat into lp://qastaging/notes-app

  1. sdkcompat
  2. Merge into trunk
Proposed by Benjamin Zeller
Status: Needs review
Proposed branch: lp://qastaging/~zeller-benjamin/notes-app/sdkcompat
Merge into: lp://qastaging/notes-app
Diff against target: 115 lines (+30/-13)
5 files modified
CMakeLists.txt (+7/-2)
click/CMakeLists.txt (+8/-1)
click/manifest.json.in (+9/-10)
debian/rules (+3/-0)
src/NotesApp/Plugins/CMakeLists.txt (+3/-0)
To merge this branch: bzr merge lp://qastaging/~zeller-benjamin/notes-app/sdkcompat
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+233892@code.qastaging.launchpad.net

Commit message

Make notes app cmake project useable out of the Box with QtCreator
- Enable click mode by default
- Disable click mode in debian rules file
- Add variable UBUNTU_MANIFEST_PATH variable so QtC knows where to look
for the manifest file
- Rename notes-apparmor.json => notes.apparmor (editor support)
- Automatically substitute click architecture in the manifest file

Description of the change

Make notes app cmake project useable out of the Box with QtCreator in devices and emulator,
there is still a problem with running it locally, because the QML plugin is in a nested
directory in the builddir, which is currently not supported.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:289
http://jenkins.qa.ubuntu.com/job/notes-app-ci/317/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/377
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3435
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/notes-app-utopic-i386-ci/20
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/516
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/589
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12942
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2838
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3740
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3740/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Reply

Unmerged revisions

289. By Benjamin Zeller

Make notes app cmake project useable out of the Box with QtCreator
- Enable click mode by default
- Disable click mode in debian rules file
- Add variable UBUNTU_MANIFEST_PATH variable so QtC knows where to look
for the manifest file
- Rename notes-apparmor.json => notes.apparmor (editor support)
- Automatically substitute click architecture in the manifest file

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches