Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/override-and-debug into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Benjamin Zeller
| Status: | Merged |
|---|---|
| Approved by: | Zoltan Balogh |
| Approved revision: | 466 |
| Merged at revision: | 462 |
| Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/override-and-debug |
| Merge into: | lp://staging/qtcreator-plugin-ubuntu |
| Prerequisite: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/more-image-info |
| Diff against target: |
390 lines (+78/-61) 18 files modified
share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml (+4/-1) src/ubuntu/device/container/ubuntulocalrunconfiguration.cpp (+16/-0) src/ubuntu/device/container/ubuntulocalrunconfiguration.h (+2/-4) src/ubuntu/device/remote/ubuntudevicesignaloperation.h (+4/-4) src/ubuntu/device/remote/ubuntudirectuploadstep.h (+1/-1) src/ubuntu/ubuntuabstractguieditor.h (+5/-5) src/ubuntu/ubuntuabstractguieditordocument.h (+1/-1) src/ubuntu/ubuntuapparmoreditor.h (+3/-3) src/ubuntu/ubuntudevicesmodel.h (+5/-5) src/ubuntu/ubuntueditorfactory.h (+2/-2) src/ubuntu/ubuntufixmanifeststep.h (+3/-3) src/ubuntu/ubuntumanifesteditor.h (+1/-1) src/ubuntu/ubuntumanifesteditorwidget.h (+3/-3) src/ubuntu/ubuntupackageoutputparser.h (+7/-7) src/ubuntu/ubuntuqmlbuildconfiguration.h (+5/-5) src/ubuntu/ubuntuvalidationresultmodel.h (+7/-7) src/ubuntu/ubuntuwelcomemode.h (+5/-5) src/ubuntu/wizards/ubuntuprojectmigrationwizard.h (+4/-4) |
| To merge this branch: | bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/override-and-debug |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zoltan Balogh | Approve | ||
| ubuntu-sdk-build-bot | continuous-integration | Needs Fixing | |
|
Review via email:
|
|||
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.
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:466
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild:
https:/