lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/unify-settings

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/qtcreator-plugin-ubuntu at revision 414

Zoltan Balogh: Approve on 2015-09-10

PS Jenkins bot: Approve (continuous-integration) on 2015-09-09

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1488402: Unify settings directories

Medium

Fix Released

Link a bug report

Related blueprints

405. By Benjamin Zeller on 2015-09-09

Merge trunk

404. By Benjamin Zeller on 2015-09-09

Fix problem with CMake based projects, now they should start again.

403. By Benjamin Zeller on 2015-09-04

Big cleanup in the contants header, remove all unused symbols

402. By Benjamin Zeller on 2015-09-04

Remove disabled constants

401. By Benjamin Zeller on 2015-09-04

Remove testcode

400. By Benjamin Zeller on 2015-09-04

- Fix Bug lp:1488402 "Unify settings directories"
- Cleanup old scripts

399. By Benjamin Zeller on 2015-09-03

Before merge

398. By Benjamin Zeller on 2015-08-12

Make sure communication dir can be created for scopes

397. By Benjamin Zeller on 2015-08-11

Small fix for go plugin

396. By Benjamin Zeller on 2015-08-11

Merge packaging changes from Timo