Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/lxd-part3 into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Benjamin Zeller
Status: | Rejected |
---|---|
Rejected by: | Benjamin Zeller |
Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/lxd-part3 |
Merge into: | lp://staging/qtcreator-plugin-ubuntu |
Prerequisite: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/lxd-part2 |
Diff against target: |
5557 lines (+1902/-2217) 47 files modified
UbuntuPlugin.pro (+12/-14) chroot-agent/chroot-agent.pro (+0/-59) chroot-agent/chrootagent.cpp (+0/-384) chroot-agent/chrootagent.h (+0/-67) chroot-agent/main.cpp (+0/-275) debian/control (+2/-9) share/qtcreator/ubuntu/scripts/.settings/org.eclipse.core.resources.prefs (+2/-2) share/qtcreator/ubuntu/scripts/qtc_chroot_get_upgrades.py (+6/-24) share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py (+66/-57) share/qtcreator/ubuntu/scripts/qtc_target_wrapper.py (+0/-141) share/qtcreator/ubuntu/scripts/usdk-target-build (+396/-227) share/qtcreator/ubuntu/scripts/usdk-target.py (+0/-455) src/ubuntu/device/container/containerdevice.cpp (+9/-2) src/ubuntu/device/container/containerdeviceprocess.cpp (+2/-2) src/ubuntu/device/container/ubuntulocalrunconfiguration.cpp (+61/-3) src/ubuntu/device/container/ubuntulocalrunconfiguration.h (+2/-1) src/ubuntu/device/container/ubuntulocalruncontrolfactory.cpp (+3/-0) src/ubuntu/device/container/ubuntulocalscopedebugsupport.cpp (+18/-2) src/ubuntu/device/container/ubuntulocalscopedebugsupport.h (+1/-0) src/ubuntu/processoutputdialog.cpp (+71/-136) src/ubuntu/processoutputdialog.h (+17/-20) src/ubuntu/processoutputdialog.ui (+108/-44) src/ubuntu/settings.cpp (+13/-0) src/ubuntu/settings.h (+3/-0) src/ubuntu/targetupgrademanager.cpp (+3/-4) src/ubuntu/ubuntuclickdialog.cpp (+121/-0) src/ubuntu/ubuntuclickdialog.h (+38/-0) src/ubuntu/ubuntuclicktool.cpp (+75/-19) src/ubuntu/ubuntuclicktool.h (+9/-5) src/ubuntu/ubuntuconstants.h (+11/-15) src/ubuntu/ubuntukitmanager.cpp (+118/-40) src/ubuntu/ubuntukitmanager.h (+1/-0) src/ubuntu/ubuntuplugin.cpp (+90/-25) src/ubuntu/ubuntuplugin.h (+3/-0) src/ubuntu/ubuntuproject.cpp (+0/-3) src/ubuntu/ubuntusettingsclickwidget.cpp (+10/-7) src/ubuntu/ubuntusettingsclickwidget.h (+1/-1) src/ubuntu/ubuntusettingsclickwidget.ui (+2/-2) src/ubuntu/wizards/createtargetimagepage.ui (+89/-90) src/ubuntu/wizards/createtargetintropage.ui (+88/-0) src/ubuntu/wizards/createtargetnamepage.ui (+38/-0) src/ubuntu/wizards/createtargetwizard.cpp (+298/-51) src/ubuntu/wizards/createtargetwizard.h (+99/-13) src/ubuntu/wizards/ubuntufatpackagingwizard.cpp (+1/-1) src/ubuntu/wizards/ubuntufirstrunwizard.cpp (+2/-5) src/ubuntu/wizards/ubuntuprojectapplicationwizard.cpp (+12/-10) ubuntu.pro (+1/-2) |
To merge this branch: | bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/lxd-part3 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zoltan Balogh | Pending | ||
Review via email:
|
Commit message
- Packaging changes required for LXD support
- Fixes found in testing
Description of the change
- Packaging changes required for LXD support
- Fixes found in testing
To post a comment you must log in.