Merge lp:~zeller-benjamin/ubuntu-sdk-ide/override-and-debug into lp:ubuntu-sdk-ide
Proposed by
Benjamin Zeller
Status: | Merged |
---|---|
Approved by: | Zoltan Balogh |
Approved revision: | 144 |
Merged at revision: | 144 |
Proposed branch: | lp:~zeller-benjamin/ubuntu-sdk-ide/override-and-debug |
Merge into: | lp:ubuntu-sdk-ide |
Diff against target: |
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) |
To merge this branch: | bzr merge lp:~zeller-benjamin/ubuntu-sdk-ide/override-and-debug |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
ubuntu-sdk-build-bot | continuous-integration | Approve | |
Zoltan Balogh | Approve | ||
Review via email: mp+300865@code.launchpad.net |
Commit message
- 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
Description of the change
- 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
To post a comment you must log in.
PASSED: Continuous integration, rev:144 /jenkins. ubuntu. com/ubuntu- sdk/job/ qtcreator- ide-ci- amd64/50/ /jenkins. ubuntu. com/ubuntu- sdk/job/ generic- update- mp/4610/ console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /jenkins. ubuntu. com/ubuntu- sdk/job/ qtcreator- ide-ci- amd64/50/ rebuild
https:/