Merge lp://staging/~juhapekka-piiroinen/qtcreator-plugin-ubuntu/binary-plugin into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Juhapekka Piiroinen
| Status: | Merged |
|---|---|
| Merged at revision: | 24 |
| Proposed branch: | lp://staging/~juhapekka-piiroinen/qtcreator-plugin-ubuntu/binary-plugin |
| Merge into: | lp://staging/qtcreator-plugin-ubuntu |
| Diff against target: |
9163 lines (+8629/-1) 97 files modified
debian/control (+42/-1) debian/qtcreator-plugin-ubuntu-cordova.install (+3/-0) debian/qtcreator-plugin-ubuntu.install (+4/-0) debian/rules (+2/-0) debian/ubuntusdk.desktop (+11/-0) qtcreator-plugin-ubuntu.pro (+2/-0) src/cordovaubuntuprojectmanager/CordovaUbuntuProject.mimetypes.xml (+9/-0) src/cordovaubuntuprojectmanager/CordovaUbuntuProjectManager.pluginspec.in (+10/-0) src/cordovaubuntuprojectmanager/common.h (+55/-0) src/cordovaubuntuprojectmanager/constants.h (+32/-0) src/cordovaubuntuprojectmanager/cordovaubuntuproject.qrc (+5/-0) src/cordovaubuntuprojectmanager/cordovaubuntuprojectmanager.pro (+51/-0) src/cordovaubuntuprojectmanager/cproject.cpp (+85/-0) src/cordovaubuntuprojectmanager/cproject.h (+62/-0) src/cordovaubuntuprojectmanager/cprojectfile.cpp (+80/-0) src/cordovaubuntuprojectmanager/cprojectfile.h (+54/-0) src/cordovaubuntuprojectmanager/cprojectmanager.h (+74/-0) src/cordovaubuntuprojectmanager/cprojectnode.cpp (+175/-0) src/cordovaubuntuprojectmanager/cprojectnode.h (+73/-0) src/cordovaubuntuprojectmanager/crunconfiguration.cpp (+92/-0) src/cordovaubuntuprojectmanager/crunconfiguration.h (+72/-0) src/cordovaubuntuprojectmanager/cruncontrol.cpp (+126/-0) src/cordovaubuntuprojectmanager/cruncontrol.h (+63/-0) src/cordovaubuntuprojectmanager/global.h (+30/-0) src/cordovaubuntuprojectmanager/plugin.cpp (+125/-0) src/cordovaubuntuprojectmanager/plugin.h (+56/-0) src/ubuntu/Ubuntu.pluginspec.in (+12/-0) src/ubuntu/UbuntuProject.mimetypes.xml (+9/-0) src/ubuntu/manifest.json.template (+13/-0) src/ubuntu/manifestlib.js (+50/-0) src/ubuntu/myapp.json.template (+6/-0) src/ubuntu/resources.qrc (+18/-0) src/ubuntu/ubuntu.pri (+1/-0) src/ubuntu/ubuntu.pro (+114/-0) src/ubuntu/ubuntu_global.h (+32/-0) src/ubuntu/ubuntuapimode.cpp (+39/-0) src/ubuntu/ubuntuapimode.h (+41/-0) src/ubuntu/ubuntubzr.cpp (+48/-0) src/ubuntu/ubuntubzr.h (+57/-0) src/ubuntu/ubuntuclickmanifest.cpp (+221/-0) src/ubuntu/ubuntuclickmanifest.h (+101/-0) src/ubuntu/ubuntuconstants.h (+186/-0) src/ubuntu/ubuntucoreappsmode.cpp (+32/-0) src/ubuntu/ubuntucoreappsmode.h (+40/-0) src/ubuntu/ubuntudevicemode.cpp (+70/-0) src/ubuntu/ubuntudevicemode.h (+49/-0) src/ubuntu/ubuntudeviceswidget.cpp (+356/-0) src/ubuntu/ubuntudeviceswidget.h (+92/-0) src/ubuntu/ubuntudeviceswidget.ui (+1016/-0) src/ubuntu/ubuntufeatureprovider.cpp (+36/-0) src/ubuntu/ubuntufeatureprovider.h (+42/-0) src/ubuntu/ubuntuircmode.cpp (+32/-0) src/ubuntu/ubuntuircmode.h (+40/-0) src/ubuntu/ubuntumenu.cpp (+428/-0) src/ubuntu/ubuntumenu.h (+77/-0) src/ubuntu/ubuntupackagingmode.cpp (+118/-0) src/ubuntu/ubuntupackagingmode.h (+53/-0) src/ubuntu/ubuntupackagingwidget.cpp (+229/-0) src/ubuntu/ubuntupackagingwidget.h (+53/-0) src/ubuntu/ubuntupackagingwidget.ui (+437/-0) src/ubuntu/ubuntupastebinmode.cpp (+14/-0) src/ubuntu/ubuntupastebinmode.h (+39/-0) src/ubuntu/ubuntuplugin.cpp (+120/-0) src/ubuntu/ubuntuplugin.h (+75/-0) src/ubuntu/ubuntuprocess.cpp (+171/-0) src/ubuntu/ubuntuprocess.h (+82/-0) src/ubuntu/ubuntuproject.cpp (+88/-0) src/ubuntu/ubuntuproject.h (+88/-0) src/ubuntu/ubuntuprojectapp.cpp (+345/-0) src/ubuntu/ubuntuprojectapp.h (+67/-0) src/ubuntu/ubuntuprojectapplicationwizard.cpp (+131/-0) src/ubuntu/ubuntuprojectapplicationwizard.h (+74/-0) src/ubuntu/ubuntuprojectfile.cpp (+76/-0) src/ubuntu/ubuntuprojectfile.h (+72/-0) src/ubuntu/ubuntuprojectmanager.cpp (+66/-0) src/ubuntu/ubuntuprojectmanager.h (+75/-0) src/ubuntu/ubuntuprojectnode.cpp (+172/-0) src/ubuntu/ubuntuprojectnode.h (+103/-0) src/ubuntu/ubunturunconfiguration.cpp (+27/-0) src/ubuntu/ubunturunconfiguration.h (+74/-0) src/ubuntu/ubunturunconfigurationfactory.cpp (+83/-0) src/ubuntu/ubunturunconfigurationfactory.h (+77/-0) src/ubuntu/ubunturuncontrol.cpp (+91/-0) src/ubuntu/ubunturuncontrol.h (+88/-0) src/ubuntu/ubunturuncontrolfactory.cpp (+52/-0) src/ubuntu/ubunturuncontrolfactory.h (+66/-0) src/ubuntu/ubuntushared.h (+40/-0) src/ubuntu/ubuntuversion.cpp (+66/-0) src/ubuntu/ubuntuversion.h (+54/-0) src/ubuntu/ubuntuversionmanager.cpp (+58/-0) src/ubuntu/ubuntuversionmanager.h (+55/-0) src/ubuntu/ubuntuwebmode.cpp (+85/-0) src/ubuntu/ubuntuwebmode.h (+54/-0) src/ubuntu/ubuntuwelcomemode.cpp (+133/-0) src/ubuntu/ubuntuwelcomemode.h (+55/-0) src/ubuntu/ubuntuwikimode.cpp (+32/-0) src/ubuntu/ubuntuwikimode.h (+40/-0) |
| To merge this branch: | bzr merge lp://staging/~juhapekka-piiroinen/qtcreator-plugin-ubuntu/binary-plugin |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Needs Fixing | |
| Zoltan Balogh | Pending | ||
| Timo Jyrinki | Pending | ||
|
Review via email:
|
|||
Description of the change
Moved binary plugin from ubuntu-
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
| Timo Jyrinki (timo-jyrinki) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:25
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://