Merge lp://staging/~abreu-alexandre/qtcreator-plugin-ubuntu/update-html5-templates into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Alexandre Abreu
| Status: | Merged |
|---|---|
| Approved by: | Alexandre Abreu |
| Approved revision: | 58 |
| Merged at revision: | 61 |
| Proposed branch: | lp://staging/~abreu-alexandre/qtcreator-plugin-ubuntu/update-html5-templates |
| Merge into: | lp://staging/qtcreator-plugin-ubuntu |
| Diff against target: |
329 lines (+141/-99) 7 files modified
debian/qtcreator-plugin-ubuntu-common.install (+1/-1) share/qtcreator/templates/wizards/ubuntu/html5-tabs/displayName.desktop (+1/-1) share/qtcreator/templates/wizards/ubuntu/html5-tabs/index.html (+65/-46) share/qtcreator/templates/wizards/ubuntu/html5-tabs/js/app.js (+9/-16) share/qtcreator/templates/wizards/ubuntu/html5-tabs/plugins.xml (+43/-0) share/qtcreator/templates/wizards/ubuntu/html5/main.qml (+0/-35) share/qtcreator/templates/wizards/ubuntu/projectypes.json (+22/-0) |
| To merge this branch: | bzr merge lp://staging/~abreu-alexandre/qtcreator-plugin-ubuntu/update-html5-templates |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Approve | |
| Zoltan Balogh | Approve | ||
|
Review via email:
|
|||
Commit message
Update HTML5 templates to reflect the QML SDK ones
Description of the change
Update HTML5 templates to reflect the QML SDK ones
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Zoltan Balogh (bzoltan) | # |
review:
Approve
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:55
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://