Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/fw1504 into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Benjamin Zeller
| Status: | Merged |
|---|---|
| Approved by: | Benjamin Zeller |
| Approved revision: | 368 |
| Merged at revision: | 372 |
| Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/fw1504 |
| Merge into: | lp://staging/qtcreator-plugin-ubuntu |
| Diff against target: |
77 lines (+7/-6) 6 files modified
share/qtcreator/templates/wizards/ubuntu/backend-app-qmake/appName/appName.apparmor (+1/-1) share/qtcreator/templates/wizards/ubuntu/qtquick-app-qmake/appName/appName.apparmor (+1/-1) share/qtcreator/templates/wizards/ubuntu/simple-app-qmake/appName/appName.apparmor (+1/-1) src/ubuntu/ubuntuclicktool.cpp (+2/-1) src/ubuntu/wizards/ubuntuprojectapplicationwizard.cpp (+1/-1) src/ubuntu/wizards/ubuntuprojectmigrationwizard.cpp (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/fw1504 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Approve | |
| Zoltan Balogh | Pending | ||
|
Review via email:
|
|||
Commit message
- Support framework 15.04
- Fix small issue in the templates
Description of the change
- Support framework 15.04
- Fix small issue in the templates
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:368
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://