Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/unify-settings into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Benjamin Zeller
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Zoltan Balogh | ||||
| Approved revision: | 405 | ||||
| Merged at revision: | 414 | ||||
| Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/unify-settings | ||||
| Merge into: | lp://staging/qtcreator-plugin-ubuntu | ||||
| Diff against target: |
1701 lines (+427/-596) 27 files modified
UbuntuPlugin.pro (+4/-2) share/qtcreator/ubuntu/scripts/functions.inc (+8/-1) share/qtcreator/ubuntu/scripts/qtc_chroot_cmake (+0/-46) share/qtcreator/ubuntu/scripts/qtc_chroot_cmake2 (+0/-104) share/qtcreator/ubuntu/scripts/qtc_chroot_gcc (+0/-43) share/qtcreator/ubuntu/scripts/qtc_chroot_make (+0/-38) share/qtcreator/ubuntu/scripts/qtc_chroot_make2 (+0/-27) share/qtcreator/ubuntu/scripts/qtc_device_applaunch.py (+3/-3) src/ubuntu/clicktoolchain.cpp (+4/-1) src/ubuntu/settings.cpp (+245/-0) src/ubuntu/settings.h (+70/-0) src/ubuntu/targetupgrademanager.cpp (+2/-6) src/ubuntu/ubuntuclicktool.cpp (+9/-12) src/ubuntu/ubuntuconstants.h (+5/-192) src/ubuntu/ubuntudevice.cpp (+9/-14) src/ubuntu/ubuntukitmanager.cpp (+3/-2) src/ubuntu/ubuntupackagestep.cpp (+4/-12) src/ubuntu/ubuntuplugin.cpp (+3/-12) src/ubuntu/ubuntuplugin.h (+2/-0) src/ubuntu/ubuntuqtversion.cpp (+3/-2) src/ubuntu/ubunturemoterunconfiguration.cpp (+4/-13) src/ubuntu/ubuntusettingsclickwidget.cpp (+16/-14) src/ubuntu/ubuntusettingsclickwidget.h (+5/-2) src/ubuntu/ubuntusettingsdeviceconnectivitywidget.cpp (+14/-20) src/ubuntu/ubuntusettingsdeviceconnectivitywidget.h (+0/-2) src/ubuntu/ubuntusettingsprojectdefaultspage.cpp (+14/-26) src/ubuntu/ubuntusettingsprojectdefaultspage.h (+0/-2) |
||||
| To merge this branch: | bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/unify-settings | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zoltan Balogh | Approve | ||
| PS Jenkins bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
- Fix Bug lp:1488402 "Unify settings directories"
- Cleanup old scripts
- Cleanup unused constants
- Fix CMake project execution on remote devices
Description of the change
- Fix Bug lp:1488402 "Unify settings directories"
- Cleanup old scripts
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
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:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:402
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://