Merge lp://staging/~abreu-alexandre/qtcreator-plugin-ubuntu/add-webapp-project-type into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Alexandre Abreu
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~abreu-alexandre/qtcreator-plugin-ubuntu/add-webapp-project-type |
| Merge into: | lp://staging/qtcreator-plugin-ubuntu |
| Diff against target: |
270 lines (+47/-11) 12 files modified
share/qtcreator/templates/wizards/ubuntu/webapp/displayName.desktop (+1/-1) share/qtcreator/templates/wizards/ubuntu/webapp/wizard.xml (+2/-2) share/qtcreator/ubuntu/menu.json (+1/-1) src/ubuntu/UbuntuProject.mimetypes.xml (+1/-0) src/ubuntu/ubuntuconstants.h (+10/-0) src/ubuntu/ubuntumenu.cpp (+10/-1) src/ubuntu/ubuntupackagestep.cpp (+3/-2) src/ubuntu/ubuntupackagingmode.cpp (+3/-1) src/ubuntu/ubuntuplugin.cpp (+4/-0) src/ubuntu/ubuntuproject.cpp (+2/-1) src/ubuntu/ubuntuprojectapplicationwizard.cpp (+7/-1) src/ubuntu/ubuntuprojectapplicationwizard.h (+3/-1) |
| To merge this branch: | bzr merge lp://staging/~abreu-alexandre/qtcreator-plugin-ubuntu/add-webapp-project-type |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Approve | |
| Ubuntu SDK team | Pending | ||
|
Review via email:
|
|||
Commit message
Add a webapp project type distinct from the html5 one
Description of the change
Add a webapp project type distinct from the html5 one
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Unmerged revisions
- 287. By Alexandre Abreu
-
updates
- 286. By Alexandre Abreu
-
udpates
- 285. By Alexandre Abreu
-
Add webapp project type
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:287
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://