Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/some_fixes into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Benjamin Zeller
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Zoltan Balogh | ||||
Approved revision: | 285 | ||||
Merged at revision: | 283 | ||||
Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/some_fixes | ||||
Merge into: | lp://staging/qtcreator-plugin-ubuntu | ||||
Diff against target: |
681 lines (+513/-24) 12 files modified
share/qtcreator/templates/wizards/ubuntu/scope/CMakeLists.txt (+3/-0) share/qtcreator/ubuntu/devicespage/DevicePage.qml (+9/-9) share/qtcreator/ubuntu/devicespage/DeviceStatusTab.qml (+2/-2) share/qtcreator/ubuntu/devicespage/FeatureStateItem.qml (+2/-2) share/qtcreator/ubuntu/devicespage/ScrollableView.qml (+1/-1) share/qtcreator/ubuntu/devicespage/SectionItem.qml (+4/-5) share/qtcreator/ubuntu/devicespage/main.qml (+1/-1) src/ubuntu/images/security-alert.svg (+158/-0) src/ubuntu/images/view-collapse.svg (+163/-0) src/ubuntu/images/view-expand.svg (+163/-0) src/ubuntu/resources.qrc (+3/-0) src/ubuntu/ubuntueditorfactory.cpp (+4/-4) |
||||
To merge this branch: | bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/some_fixes | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zoltan Balogh | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+237909@code.staging.launchpad.net |
Commit message
- Fix error warnings about overriding Actions
- Fix missing devicepage icons on trusty
- Fix bug lp:1379644 "I can only get the test configuration for scope
development"
Description of the change
- Fix error warnings about overriding Actions
- Fix missing devicepage icons on trusty
- Fix bug lp:1379644 "I can only get the test configuration for scope
development"
To post a comment you must log in.
PASSED: Continuous integration, rev:285 jenkins. qa.ubuntu. com/job/ qtcreator- plugin- ubuntu- ci/446/ jenkins. qa.ubuntu. com/job/ qtcreator- plugin- ubuntu- utopic- amd64-ci/ 214 jenkins. qa.ubuntu. com/job/ qtcreator- plugin- ubuntu- utopic- armhf-ci/ 214
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/qtcreator- plugin- ubuntu- ci/446/ rebuild
http://