Merge lp://staging/~zeller-benjamin/ubuntu-sdk-ide/snapcraft-step1 into lp://staging/ubuntu-sdk-ide
Proposed by
Benjamin Zeller
Status: | Merged |
---|---|
Approved by: | Zoltan Balogh |
Approved revision: | 162 |
Merged at revision: | 162 |
Proposed branch: | lp://staging/~zeller-benjamin/ubuntu-sdk-ide/snapcraft-step1 |
Merge into: | lp://staging/ubuntu-sdk-ide |
Diff against target: |
1792 lines (+1298/-81) 30 files modified
CMakeLists.txt (+1/-1) apply-patches.sh (+12/-0) debian/patches/cmake_ubuntuspecificbits.diff (+101/-60) dist/qtcreator/src/plugins/ubuntu/UbuntuPlugin.pro (+9/-2) dist/qtcreator/src/plugins/ubuntu/share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/appName.pro (+32/-0) dist/qtcreator/src/plugins/ubuntu/share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/appName/Main.qml (+54/-0) dist/qtcreator/src/plugins/ubuntu/share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/appName/appName.desktop (+9/-0) dist/qtcreator/src/plugins/ubuntu/share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/appName/appName.pro (+48/-0) dist/qtcreator/src/plugins/ubuntu/share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/appName/appName.qrc (+5/-0) dist/qtcreator/src/plugins/ubuntu/share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/appName/appName.wrapper (+63/-0) dist/qtcreator/src/plugins/ubuntu/share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/appName/main.cpp (+14/-0) dist/qtcreator/src/plugins/ubuntu/share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/snapcraft.yaml (+23/-0) dist/qtcreator/src/plugins/ubuntu/share/qtcreator/templates/wizards/ubuntu/snap-qtquick-app-qmake/wizard.json (+108/-0) dist/qtcreator/src/plugins/ubuntu/share/qtcreator/ubuntu/qml/publishpage.qml (+2/-2) dist/qtcreator/src/plugins/ubuntu/share/qtcreator/ubuntu/scripts/usdk-target-build (+1/-0) dist/qtcreator/src/plugins/ubuntu/src/plugin.pri (+1/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/clicktoolchain.cpp (+1/-1) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/clicktoolchain.h (+1/-1) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/snapcraftpackagestep.cpp (+468/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/snapcraftpackagestep.h (+105/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/snaphelper.cpp (+30/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/snap/snaphelper.h (+22/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuconstants.h (+1/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntujsextension.cpp (+46/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntujsextension.h (+37/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntupackagingmodel.cpp (+86/-5) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntupackagingmodel.h (+1/-0) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuplugin.cpp (+9/-3) dist/qtcreator/src/plugins/ubuntu/src/ubuntu/wizards/ubuntuprojectapplicationwizard.cpp (+7/-5) fix-qt-build.py (+1/-1) |
To merge this branch: | bzr merge lp://staging/~zeller-benjamin/ubuntu-sdk-ide/snapcraft-step1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
ubuntu-sdk-build-bot | continuous-integration | Approve | |
Zoltan Balogh | Approve | ||
Review via email: mp+306510@code.staging.launchpad.net |
Commit message
Support to package snapcraft projects in the IDE (Step 1)
Description of the change
Support to package snapcraft projects in the IDE (Step 1)
To post a comment you must log in.
PASSED: Continuous integration, rev:162 /jenkins. ubuntu. com/ubuntu- sdk/job/ qtcreator- ide-ci- amd64/346/ /jenkins. ubuntu. com/ubuntu- sdk/job/ generic- update- mp/6776/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /jenkins. ubuntu. com/ubuntu- sdk/job/ qtcreator- ide-ci- amd64/346/ rebuild
https:/