lp:~zeller-benjamin/ubuntu-sdk-ide/override-and-debug

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-sdk-ide at revision 144

ubuntu-sdk-build-bot: Approve (continuous-integration) on 2016-07-25

Zoltan Balogh: Approve on 2016-07-25

Diff: 390 lines (+78/-61)

18 files modified

dist/qtcreator/src/plugins/ubuntu/share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml (+4/-1)
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/device/container/ubuntulocalrunconfiguration.cpp (+16/-0)
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/device/container/ubuntulocalrunconfiguration.h (+2/-4)
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/device/remote/ubuntudevicesignaloperation.h (+4/-4)
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/device/remote/ubuntudirectuploadstep.h (+1/-1)
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuabstractguieditor.h (+5/-5)
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuabstractguieditordocument.h (+1/-1)
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuapparmoreditor.h (+3/-3)
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntudevicesmodel.h (+5/-5)
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntueditorfactory.h (+2/-2)
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntufixmanifeststep.h (+3/-3)
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntumanifesteditor.h (+1/-1)
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntumanifesteditorwidget.h (+3/-3)
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntupackageoutputparser.h (+7/-7)
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuqmlbuildconfiguration.h (+5/-5)
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuvalidationresultmodel.h (+7/-7)
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/ubuntuwelcomemode.h (+5/-5)
dist/qtcreator/src/plugins/ubuntu/src/ubuntu/wizards/ubuntuprojectmigrationwizard.h (+4/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

144. By Benjamin Zeller on 2016-07-22

- Add some descriptive text when there is no framework detected for a device
- Mark all virtuals that override with the override keyword
- Fix local debugging by passing the directory where the ld loader is located

143. By Benjamin Zeller on 2016-07-13

Add pulseaudio to the required packages

142. By Benjamin Zeller on 2016-07-13

Add sound script

141. By Benjamin Zeller on 2016-07-12

bump version nr

140. By Benjamin Zeller on 2016-07-12

merge trunk

139. By Benjamin Zeller on 2016-07-12

Sync deps

138. By Benjamin Zeller on 2016-07-07

Sync with qtcreator-plugin-ubuntu

137. By Benjamin Zeller on 2016-06-27

Fix image filtering

136. By Benjamin Zeller on 2016-06-10

Remove unneeded files

135. By Benjamin Zeller on 2016-06-10

save git files that are required for building