Merge lp://staging/~zeller-benjamin/ubuntu-sdk-ide/snapcraft-run into lp://staging/ubuntu-sdk-ide
Proposed by
Benjamin Zeller
| Status: | Merged |
|---|---|
| Approved by: | Zoltan Balogh |
| Approved revision: | 167 |
| Merged at revision: | 165 |
| Proposed branch: | lp://staging/~zeller-benjamin/ubuntu-sdk-ide/snapcraft-run |
| Merge into: | lp://staging/ubuntu-sdk-ide |
| Diff against target: |
1902 lines (+1084/-159) 27 files modified
debian/patches/cmake_ubuntuspecificbits.diff (+192/-50) dist/qtcreator/src/plugins/ubuntu/UbuntuPlugin.pro (+2/-2) dist/qtcreator/src/plugins/ubuntu/share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/snapcraft.yaml (+1/-1) dist/qtcreator/src/plugins/ubuntu/share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/wizard.json (+2/-2) dist/qtcreator/src/plugins/ubuntu/share/qtcreator/ubuntu/scripts/qtc_desktop_snaprunner.py (+84/-0) dist/qtcreator/src/plugins/ubuntu/share/qtcreator/ubuntu/scripts/run_snapcraft.py (+22/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/clicktoolchain.cpp (+21/-1) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/clicktoolchain.h (+1/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftbuildconfiguration.cpp (+4/-1) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftbuildconfigurationfactory.cpp (+9/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftproject.cpp (+63/-5) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftproject.h (+14/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftprojectnode.cpp (+38/-19) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftstep.cpp (+74/-2) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snapcraftstep.h (+17/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snaprunconfiguration.cpp (+241/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snaprunconfiguration.h (+87/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snaprunconfigurationfactory.cpp (+85/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/project/snaprunconfigurationfactory.h (+31/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/snap.pri (+6/-2) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/snapcraftpackagestep.cpp (+1/-1) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h (+12/-13) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntujsextension.cpp (+11/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntujsextension.h (+1/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuplugin.cpp (+9/-4) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuversion.cpp (+43/-45) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuversion.h (+13/-11) |
| To merge this branch: | bzr merge lp://staging/~zeller-benjamin/ubuntu-sdk-ide/snapcraft-run |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| ubuntu-sdk-build-bot | continuous-integration | Approve | |
| Zoltan Balogh | Approve | ||
|
Review via email:
|
|||
Commit message
- Support running snapcraft projects from the IDE
- Patch RunControlFactories to disable unwanted RC modes for snapcraft projects
Description of the change
- Support running snapcraft projects from the IDE
- Patch RunControlFactories to disable unwanted RC modes for snapcraft projects
To post a comment you must log in.
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) 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:167
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/