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
Reviewer Review Type Date Requested Status
Benjamin Zeller Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+282918@code.staging.launchpad.net

Commit message

Adjust HTML5 template to mirror the QML sample app

Description of the change

Clone and re-submit this MR: https://code.launchpad.net/~elijahhhellis/qtcreator-plugin-ubuntu/mychanges/+merge/280694

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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Benjamin Zeller (zeller-benjamin) wrote :

ok

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: