Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/packaging-qml into lp://staging/qtcreator-plugin-ubuntu
Status: | Merged |
---|---|
Approved by: | Zoltan Balogh |
Approved revision: | 94 |
Merged at revision: | 88 |
Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/packaging-qml |
Merge into: | lp://staging/qtcreator-plugin-ubuntu |
Diff against target: |
1560 lines (+961/-264) 13 files modified
share/qtcreator/ubuntu/menu.json (+1/-2) share/qtcreator/ubuntu/scripts/click_create_target (+4/-1) src/ubuntu/ubuntu.pro (+4/-2) src/ubuntu/ubuntuconstants.h (+2/-1) src/ubuntu/ubuntumenu.cpp (+36/-20) src/ubuntu/ubuntupackagingmode.cpp (+3/-1) src/ubuntu/ubuntupackagingmode.h (+1/-2) src/ubuntu/ubuntupackagingwidget.cpp (+69/-21) src/ubuntu/ubuntupackagingwidget.h (+18/-2) src/ubuntu/ubuntupackagingwidget.ui (+260/-212) src/ubuntu/ubuntuprocess.cpp (+3/-0) src/ubuntu/ubuntuvalidationresultmodel.cpp (+459/-0) src/ubuntu/ubuntuvalidationresultmodel.h (+101/-0) |
To merge this branch: | bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/packaging-qml |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zoltan Balogh | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+206001@code.staging.launchpad.net |
Commit message
- removed init_page from packaging tab
- enable packaging tab always if the click-review tools are installed
- Show detailed information about a error under the validation treeview
- install cmake after a click chroot creation
- enable run on device for html projects
- renamed packaging tab
- Parser for click-run-checks output, show results in a itemview
Description of the change
- removed init_page from packaging tab
- enable packaging tab always if the click-review tools are installed
- Show detailed information about a error under the validation treeview
- install cmake after a click chroot creation
- enable run on device for html projects
- renamed packaging tab
- Parser for click-run-checks output, show results in a itemview
PASSED: Continuous integration, rev:92 jenkins. qa.ubuntu. com/job/ qtcreator- plugin- ubuntu- ci/146/ jenkins. qa.ubuntu. com/job/ qtcreator- plugin- ubuntu- trusty- amd64-ci/ 77 jenkins. qa.ubuntu. com/job/ qtcreator- plugin- ubuntu- trusty- armhf-ci/ 77
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/qtcreator- plugin- ubuntu- ci/146/ rebuild
http://