Merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/care_about_frameworks into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Benjamin Zeller
| Status: | Merged |
|---|---|
| Approved by: | Zoltan Balogh |
| Approved revision: | 367 |
| Merged at revision: | 369 |
| Proposed branch: | lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/care_about_frameworks |
| Merge into: | lp://staging/qtcreator-plugin-ubuntu |
| Diff against target: |
236 lines (+66/-16) 7 files modified
share/qtcreator/ubuntu/qml/DevicesPage/DevicePage.qml (+4/-0) share/qtcreator/ubuntu/scripts/device_version (+1/-0) src/ubuntu/ubuntudevice.cpp (+43/-14) src/ubuntu/ubuntudevice.h (+2/-1) src/ubuntu/ubuntudevicesmodel.cpp (+4/-1) src/ubuntu/ubuntudevicesmodel.h (+1/-0) src/ubuntu/ubuntukitmanager.cpp (+11/-0) |
| To merge this branch: | bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-ubuntu/care_about_frameworks |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Zoltan Balogh | Approve | ||
|
Review via email:
|
|||
Commit message
- Fix bug lp:1391527 Adding UI to show the supported frameworks for the
emulator and the phone
- Autocreate Kits for the devices depending on the framework they
support
Description of the change
- Fix bug lp:1391527 Adding UI to show the supported frameworks for the
emulator and the phone
- Autocreate Kits for the devices depending on the framework they
support
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Good to go