Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/bugfix3 into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Benjamin Zeller
| Status: | Merged | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Zoltan Balogh | ||||||||||||
| Approved revision: | 385 | ||||||||||||
| Merged at revision: | 389 | ||||||||||||
| Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/bugfix3 | ||||||||||||
| Merge into: | lp://staging/qtcreator-plugin-ubuntu | ||||||||||||
| Diff against target: |
115 lines (+12/-7) 8 files modified
share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/CMakeLists.txt (+1/-1) share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/autopilot/displayName/main/test_main.py (+1/-1) share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/wizard.xml (+1/-1) share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/CMakeLists.txt (+1/-1) share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/autopilot/displayName/main/test_main.py (+1/-1) share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/wizard.xml (+1/-1) share/qtcreator/ubuntu/qml/DevicesPage/NewEmulatorDialog.qml (+1/-1) src/ubuntu/ubuntumanifesteditorwidget.cpp (+5/-0) |
||||||||||||
| To merge this branch: | bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/bugfix3 | ||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Approve | |
| Zoltan Balogh | Pending | ||
|
Review via email:
|
|||
Commit message
- Fix lp:1357237 "Inconsistent QML main files"
- Fix lp:1280631 "SDK should have same restrictions on version number"
- Fix lp:1450481 "Default password not displayed in emulator creation wizard"
Description of the change
- Fix lp:1357237 "Inconsistent QML main files"
- Fix lp:1280631 "SDK should have same restrictions on version number"
- Fix lp:1450481 "Default password not displayed in emulator creation wizard"
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) 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:385
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://