Merge lp://staging/~bzoltan/qtcreator-plugin-ubuntu/Adjust_HTML5_template into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Zoltan Balogh
Status: | Merged |
---|---|
Approved by: | Zoltan Balogh |
Approved revision: | 437 |
Merged at revision: | 438 |
Proposed branch: | lp://staging/~bzoltan/qtcreator-plugin-ubuntu/Adjust_HTML5_template |
Merge into: | lp://staging/qtcreator-plugin-ubuntu |
Diff against target: |
100 lines (+17/-27) 3 files modified
share/qtcreator/templates/wizards/ubuntu/html5-simple/www/css/app.css (+4/-5) share/qtcreator/templates/wizards/ubuntu/html5-simple/www/index.html (+7/-22) share/qtcreator/templates/wizards/ubuntu/html5-simple/www/js/application.js (+6/-0) |
To merge this branch: | bzr merge lp://staging/~bzoltan/qtcreator-plugin-ubuntu/Adjust_HTML5_template |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Benjamin Zeller | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email:
|
Commit message
Adjust HTML5 template to mirror the QML sample app
Description of the change
Clone and re-submit this MR: https:/
As the bzr ID of elijahhhellis in that branch contains a \n and that makes the CI freak out.
To post a comment you must log in.
PASSED: Continuous integration, rev:437 jenkins. qa.ubuntu. com/job/ qtcreator- plugin- ubuntu- ci/582/ jenkins. qa.ubuntu. com/job/ qtcreator- plugin- ubuntu- wily-amd64- ci/43 jenkins. qa.ubuntu. com/job/ qtcreator- plugin- ubuntu- wily-armhf- ci/43
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/qtcreator- plugin- ubuntu- ci/582/ rebuild
http://