qtcreator-plugin-ubuntu

Merge lp://staging/~abreu-alexandre/qtcreator-plugin-ubuntu/single-html5-template into lp://staging/qtcreator-plugin-ubuntu

single-html5-template
Merge into trunk

Proposed by Alexandre Abreu on 2013-12-10

Status:	Merged
Approved by:	Robert Bruce Park on 2013-12-13
Approved revision:	67
Merged at revision:	57
Proposed branch:	lp://staging/~abreu-alexandre/qtcreator-plugin-ubuntu/single-html5-template
Merge into:	lp://staging/qtcreator-plugin-ubuntu
Diff against target:	2335 lines (+142/-1643) 49 files modified debian/control (+0/-29) debian/qtcreator-plugin-ubuntu-cordova-common.install (+0/-1) debian/qtcreator-plugin-ubuntu-cordova.install (+0/-3) debian/rules (+1/-1) debian/ubuntusdk.desktop (+1/-1) qtcreator-plugin-ubuntu.pro (+1/-1) share/qtcreator/templates/wizards/ubuntu/cordovaubuntu/app.js (+0/-27) share/qtcreator/templates/wizards/ubuntu/cordovaubuntu/css/index.css (+0/-57) share/qtcreator/templates/wizards/ubuntu/cordovaubuntu/displayName.desktop (+0/-8) share/qtcreator/templates/wizards/ubuntu/cordovaubuntu/index.html (+0/-90) share/qtcreator/templates/wizards/ubuntu/cordovaubuntu/plugins.xml (+0/-43) share/qtcreator/templates/wizards/ubuntu/projectypes.json (+0/-23) share/qtcreator/ubuntu/menu.json (+14/-1) share/qtcreator/ubuntu/scripts/qtc_device_run_app (+13/-8) share/qtcreator/ubuntu/scripts/qtc_project_click_create (+1/-1) src/cordovaubuntuprojectmanager/CordovaUbuntuProject.mimetypes.xml (+0/-9) src/cordovaubuntuprojectmanager/CordovaUbuntuProjectManager.pluginspec.in (+0/-10) src/cordovaubuntuprojectmanager/common.h (+0/-55) src/cordovaubuntuprojectmanager/constants.h (+0/-32) src/cordovaubuntuprojectmanager/cordovaubuntuproject.qrc (+0/-5) src/cordovaubuntuprojectmanager/cordovaubuntuprojectmanager.pro (+0/-29) src/cordovaubuntuprojectmanager/cordovaubuntuprojectmanager_dependencies.pri (+0/-7) src/cordovaubuntuprojectmanager/cproject.cpp (+0/-85) src/cordovaubuntuprojectmanager/cproject.h (+0/-62) src/cordovaubuntuprojectmanager/cprojectfile.cpp (+0/-80) src/cordovaubuntuprojectmanager/cprojectfile.h (+0/-54) src/cordovaubuntuprojectmanager/cprojectmanager.h (+0/-74) src/cordovaubuntuprojectmanager/cprojectnode.cpp (+0/-175) src/cordovaubuntuprojectmanager/cprojectnode.h (+0/-73) src/cordovaubuntuprojectmanager/crunconfiguration.cpp (+0/-86) src/cordovaubuntuprojectmanager/crunconfiguration.h (+0/-72) src/cordovaubuntuprojectmanager/cruncontrol.cpp (+0/-126) src/cordovaubuntuprojectmanager/cruncontrol.h (+0/-63) src/cordovaubuntuprojectmanager/global.h (+0/-30) src/cordovaubuntuprojectmanager/plugin.cpp (+0/-126) src/cordovaubuntuprojectmanager/plugin.h (+0/-56) src/ubuntu/UbuntuProject.mimetypes.xml (+1/-0) src/ubuntu/ubuntuconstants.h (+6/-4) src/ubuntu/ubuntumenu.cpp (+34/-8) src/ubuntu/ubuntumenu.h (+6/-0) src/ubuntu/ubuntupackagingmode.cpp (+2/-6) src/ubuntu/ubuntuplugin.cpp (+7/-3) src/ubuntu/ubuntuproject.cpp (+22/-1) src/ubuntu/ubuntuproject.h (+7/-0) src/ubuntu/ubuntuprojectapp.cpp (+8/-7) src/ubuntu/ubunturunconfigurationfactory.cpp (+6/-6) src/ubuntu/ubunturunconfigurationfactory.h (+2/-3) src/ubuntu/ubunturuncontrol.cpp (+9/-2) src/ubuntu/ubunturuncontrolfactory.cpp (+1/-0)
To merge this branch:	bzr merge lp://staging/~abreu-alexandre/qtcreator-plugin-ubuntu/single-html5-template
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Zoltan Balogh		2013-12-10	Approve on 2013-12-12
PS Jenkins bot	continuous-integration		Approve on 2013-12-11
Review via email: mp+198390@code.staging.launchpad.net

Commit message

Update Ubunt QtC template to account for a new/converged html5 template.
The template has been simplified and brought closer to the QML tabs one, and the MR handle the newly created project that is not qml based, but only contains html/js files with a specific 'runner'.

Description of the change

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-10:

FAILED: Continuous integration, rev:64
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/94/
Executed test runs:
FAILURE: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-amd64-ci/25/console
FAILURE: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-armhf-ci/25/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/94/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Robert Bruce Park (robru) wrote on 2013-12-10:

I don't understand the nature of the deletions on this branch. Why are you ripping out such a large piece?

lp://staging/~abreu-alexandre/qtcreator-plugin-ubuntu/single-html5-template updated on 2013-12-11

65. By Alexandre Abreu on 2013-12-11: remove cordova left overs

Revision history for this message

Alexandre Abreu (abreu-alexandre) wrote on 2013-12-11:

> I don't understand the nature of the deletions on this branch. Why are you
> ripping out such a large piece?

The idea is to simplify the html5 story, which can be summed up as ripping out
the cordova plugin and template, and having a single html5 plugin/project with the proper
support.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-12-11:

PASSED: Continuous integration, rev:65
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/95/
Executed test runs:
SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-amd64-ci/26
SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-trusty-armhf-ci/26