Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/sdk-refactor2 into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Benjamin Zeller
Status: | Merged | ||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Zoltan Balogh | ||||||||||||||||
Approved revision: | 398 | ||||||||||||||||
Merged at revision: | 407 | ||||||||||||||||
Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/sdk-refactor2 | ||||||||||||||||
Merge into: | lp://staging/qtcreator-plugin-ubuntu | ||||||||||||||||
Diff against target: |
6072 lines (+1656/-1814) 108 files modified
Ubuntu.json.in (+12/-0) UbuntuPlugin.pro (+174/-193) chroot-agent/chroot-agent.pro (+24/-2) debian/control (+1/-8) debian/qtcreator-plugin-ubuntu-autopilot.install (+1/-1) debian/qtcreator-plugin-ubuntu-common.install (+1/-12) debian/qtcreator-plugin-ubuntu.install (+1/-2) debian/rules (+14/-10) share/qtcreator/templates/wizards/ubuntu/scope-14.10/wizard.xml (+1/-1) share/qtcreator/ubuntu/qml/test.qml# (+0/-18) share/qtcreator/ubuntu/scripts/device_search (+1/-1) share/qtcreator/ubuntu/scripts/qtc_chroot_wrapper.py (+12/-0) share/qtcreator/ubuntu/scripts/qtc_desktop_scoperunner.py (+110/-0) src/plugin.pri (+71/-35) src/ubuntu/Ubuntu.pluginspec.in (+0/-20) src/ubuntu/UbuntuProject.mimetypes.xml (+5/-0) src/ubuntu/clicktoolchain.cpp (+8/-3) src/ubuntu/clicktoolchain.h (+1/-0) src/ubuntu/ubuntuabstractguieditor.cpp (+9/-14) src/ubuntu/ubuntuabstractguieditor.h (+4/-4) src/ubuntu/ubuntuabstractguieditordocument.cpp (+7/-7) src/ubuntu/ubuntuabstractguieditordocument.h (+3/-3) src/ubuntu/ubuntuabstractguieditorwidget.cpp (+26/-11) src/ubuntu/ubuntuabstractguieditorwidget.h (+8/-6) src/ubuntu/ubuntuapimode.cpp (+0/-152) src/ubuntu/ubuntuapimode.h (+0/-52) src/ubuntu/ubuntuapparmoreditor.cpp (+8/-14) src/ubuntu/ubuntuapparmoreditor.h (+1/-1) src/ubuntu/ubuntuclickmanifest.cpp (+1/-1) src/ubuntu/ubuntuclicktool.cpp (+33/-1) src/ubuntu/ubuntuclicktool.h (+2/-0) src/ubuntu/ubuntuconstants.h (+1/-12) src/ubuntu/ubuntucoreappsmode.cpp (+0/-32) src/ubuntu/ubuntucoreappsmode.h (+0/-40) src/ubuntu/ubuntudevicemode.cpp (+7/-2) src/ubuntu/ubuntudevicesmodel.cpp (+10/-10) src/ubuntu/ubuntueditorfactory.cpp (+2/-1) src/ubuntu/ubuntufeatureprovider.h (+0/-2) src/ubuntu/ubuntuhtmlbuildconfiguration.cpp (+4/-6) src/ubuntu/ubuntuircmode.cpp (+0/-32) src/ubuntu/ubuntuircmode.h (+0/-40) src/ubuntu/ubuntukitmanager.cpp (+95/-36) src/ubuntu/ubuntukitmanager.h (+7/-0) src/ubuntu/ubuntulocaldeployconfiguration.cpp (+0/-1) src/ubuntu/ubuntulocalrunconfiguration.cpp (+129/-49) src/ubuntu/ubuntulocalrunconfiguration.h (+23/-10) src/ubuntu/ubuntulocalrunconfigurationfactory.cpp (+22/-6) src/ubuntu/ubuntulocalrunconfigurationfactory.h (+1/-2) src/ubuntu/ubuntulocalruncontrolfactory.cpp (+178/-0) src/ubuntu/ubuntulocalruncontrolfactory.h (+25/-0) src/ubuntu/ubuntulocalscopedebugsupport.cpp (+171/-0) src/ubuntu/ubuntulocalscopedebugsupport.h (+53/-0) src/ubuntu/ubuntumanifesteditor.cpp (+1/-2) src/ubuntu/ubuntumanifesteditorwidget.cpp (+15/-22) src/ubuntu/ubuntumanifesteditorwidget.h (+2/-5) src/ubuntu/ubuntumenu.cpp (+11/-7) src/ubuntu/ubuntupackageoutputparser.cpp (+1/-1) src/ubuntu/ubuntupackagestep.cpp (+23/-62) src/ubuntu/ubuntupackagingmode.cpp (+0/-1) src/ubuntu/ubuntupackagingmodel.cpp (+3/-4) src/ubuntu/ubuntupastebinmode.cpp (+0/-14) src/ubuntu/ubuntupastebinmode.h (+0/-39) src/ubuntu/ubuntuplugin.cpp (+29/-67) src/ubuntu/ubuntuplugin.h (+2/-11) src/ubuntu/ubuntuproject.cpp (+13/-16) src/ubuntu/ubuntuproject.h (+6/-9) src/ubuntu/ubuntuprojectfile.cpp (+2/-5) src/ubuntu/ubuntuprojectfile.h (+0/-2) src/ubuntu/ubuntuprojecthelper.cpp (+59/-1) src/ubuntu/ubuntuprojecthelper.h (+1/-0) src/ubuntu/ubuntuprojectmanager.cpp (+1/-1) src/ubuntu/ubuntuprojectmanager.h (+0/-1) src/ubuntu/ubuntuprojectnode.cpp (+7/-8) src/ubuntu/ubuntuprojectnode.h (+12/-15) src/ubuntu/ubuntuqmlbuildconfiguration.cpp (+7/-9) src/ubuntu/ubuntuqtversion.cpp (+1/-1) src/ubuntu/ubunturemoteanalyzesupport.cpp (+3/-3) src/ubuntu/ubunturemoteanalyzesupport.h (+1/-1) src/ubuntu/ubunturemotedebugsupport.cpp (+39/-20) src/ubuntu/ubunturemotedebugsupport.h (+2/-2) src/ubuntu/ubunturemotedeployconfiguration.cpp (+6/-2) src/ubuntu/ubunturemotedeployconfiguration.h (+2/-0) src/ubuntu/ubunturemoterunconfiguration.cpp (+16/-10) src/ubuntu/ubunturemoterunconfiguration.h (+2/-1) src/ubuntu/ubunturemoteruncontrol.cpp (+3/-6) src/ubuntu/ubunturemoteruncontrol.h (+0/-1) src/ubuntu/ubunturemoteruncontrolfactory.cpp (+27/-24) src/ubuntu/ubunturemoteruncontrolfactory.h (+2/-3) src/ubuntu/ubuntusettingsclickwidget.cpp (+6/-6) src/ubuntu/ubuntusettingspage.cpp (+0/-58) src/ubuntu/ubuntusettingspage.h (+0/-47) src/ubuntu/ubuntusettingswidget.cpp (+0/-56) src/ubuntu/ubuntusettingswidget.h (+0/-44) src/ubuntu/ubuntusettingswidget.ui (+0/-90) src/ubuntu/ubuntuvalidationresultmodel.cpp (+13/-8) src/ubuntu/ubuntuvalidationresultmodel.h (+1/-0) src/ubuntu/ubuntuwebmode.cpp (+0/-92) src/ubuntu/ubuntuwebmode.h (+0/-56) src/ubuntu/ubuntuwelcomemode.cpp (+4/-5) src/ubuntu/ubuntuwelcomemode.h (+3/-7) src/ubuntu/ubuntuwikimode.cpp (+0/-32) src/ubuntu/ubuntuwikimode.h (+0/-40) src/ubuntu/wizards/ubuntufatpackagingwizard.cpp (+2/-1) src/ubuntu/wizards/ubuntuprojectapplicationwizard.cpp (+25/-16) src/ubuntu/wizards/ubuntuprojectapplicationwizard.h (+9/-8) src/ubuntu/wizards/ubuntuprojectmigrationwizard.cpp (+8/-8) ubuntu.pro (+12/-9) ubuntu_dependencies.pri (+7/-2) |
||||||||||||||||
To merge this branch: | bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/sdk-refactor2 | ||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Timo Jyrinki | Approve | ||
Review via email: mp+251633@code.staging.launchpad.net |
Commit message
- Removed modes depending on deprected QtWebKit mode, also most of them were not really useful lp:1457473
- Fix Bug lp:1462312 "The plugin doesn't remember Run Configuration settings at all"
- Refactor ubuntu-sdk plugin to compile against the QtC upstream master branch
To post a comment you must log in.
Refactor ubuntu-sdk plugin to compile against the QtC upstream master branch