Merge lp://staging/~dpm/ubuntu-filemanager-app/click-everywhere into lp://staging/ubuntu-filemanager-app
Proposed by
David Planella
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Nicholas Skaggs | ||||
| Approved revision: | 164 | ||||
| Merged at revision: | 163 | ||||
| Proposed branch: | lp://staging/~dpm/ubuntu-filemanager-app/click-everywhere | ||||
| Merge into: | lp://staging/ubuntu-filemanager-app | ||||
| Prerequisite: | lp://staging/~dpm/ubuntu-filemanager-app/fix-libname | ||||
| Diff against target: |
37 lines (+8/-4) 2 files modified
CMakeLists.txt (+5/-1) manifest.json (+3/-3) |
||||
| To merge this branch: | bzr merge lp://staging/~dpm/ubuntu-filemanager-app/click-everywhere | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Nicholas Skaggs (community) | Approve | ||
| Carlos Jose Mazieri | Approve | ||
| Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Make the click build to work with both Qt Creator and click-buddy
Now you should be able to build the package on either:
1) Qt Creator
- Remember to 1) go to the Projects tab 2) click on the "Build" subtab of the "UbuntuSDK for armhf..." tab 3) Then go to the "CMake arguments" text field and add "-DCLICK_MODE=on" without the quotes
2) Click-buddy
$ click-buddy --dir . --arch armhf --framework ubuntu-sdk-14.04
Description of the change
Make the click build to work with both Qt Creator and click-buddy
To post a comment you must log in.
Revision history for this message
| Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Nicholas Skaggs (nskaggs) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:164
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://