Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/snapcraft-step1 into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Benjamin Zeller
| Status: | Merged |
|---|---|
| Approved by: | Zoltan Balogh |
| Approved revision: | 471 |
| Merged at revision: | 470 |
| Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/snapcraft-step1 |
| Merge into: | lp://staging/qtcreator-plugin-ubuntu |
| Diff against target: |
1485 lines (+1183/-19) 26 files modified
UbuntuPlugin.pro (+9/-2) share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/appName.pro (+32/-0) share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/appName/Main.qml (+54/-0) share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/appName/appName.desktop (+9/-0) share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/appName/appName.pro (+48/-0) share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/appName/appName.qrc (+5/-0) share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/appName/appName.wrapper (+63/-0) share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/appName/main.cpp (+14/-0) share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/snapcraft.yaml (+23/-0) share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/wizard.json (+108/-0) share/qtcreator/ubuntu/qml/publishpage.qml (+2/-2) share/qtcreator/ubuntu/scripts/usdk-target-build (+1/-0) src/plugin.pri (+1/-0) src/ubuntu/clicktoolchain.cpp (+1/-1) src/ubuntu/clicktoolchain.h (+1/-1) src/ubuntu/snap/snapcraftpackagestep.cpp (+468/-0) src/ubuntu/snap/snapcraftpackagestep.h (+105/-0) src/ubuntu/snap/snaphelper.cpp (+30/-0) src/ubuntu/snap/snaphelper.h (+22/-0) src/ubuntu/ubuntuconstants.h (+1/-0) src/ubuntu/ubuntujsextension.cpp (+46/-0) src/ubuntu/ubuntujsextension.h (+37/-0) src/ubuntu/ubuntupackagingmodel.cpp (+86/-5) src/ubuntu/ubuntupackagingmodel.h (+1/-0) src/ubuntu/ubuntuplugin.cpp (+9/-3) src/ubuntu/wizards/ubuntuprojectapplicationwizard.cpp (+7/-5) |
| To merge this branch: | bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/snapcraft-step1 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zoltan Balogh | Approve | ||
| ubuntu-sdk-build-bot | continuous-integration | Needs Fixing | |
|
Review via email:
|
|||
Commit message
Support packaging snapcraft projects from the IDE (Step 1)
Description of the change
Support packaging snapcraft projects from the IDE (Step 1)
To post a comment you must log in.
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Zoltan Balogh (bzoltan) wrote | # |
Revision history for this message
| Zoltan Balogh (bzoltan) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:470
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/