Merge lp://staging/~juhapekka-piiroinen/qtcreator-plugin-ubuntu/backport-fix-1227618 into lp://staging/qtcreator-plugin-ubuntu
Proposed by
Juhapekka Piiroinen
| Status: | Merged |
|---|---|
| Approved by: | Juhapekka Piiroinen |
| Approved revision: | 34 |
| Merged at revision: | 34 |
| Proposed branch: | lp://staging/~juhapekka-piiroinen/qtcreator-plugin-ubuntu/backport-fix-1227618 |
| Merge into: | lp://staging/qtcreator-plugin-ubuntu |
| Diff against target: |
321 lines (+102/-33) 10 files modified
debian/changelog (+7/-0) src/ubuntu/ubuntudeviceswidget.cpp (+18/-14) src/ubuntu/ubuntupolicygroupinfo.cpp (+13/-4) src/ubuntu/ubuntupolicygroupinfo.h (+3/-0) src/ubuntu/ubuntupolicygroupmodel.cpp (+12/-3) src/ubuntu/ubuntupolicygroupmodel.h (+4/-0) src/ubuntu/ubuntusecuritypolicypickerdialog.cpp (+7/-3) src/ubuntu/ubuntusecuritypolicypickerdialog.ui (+16/-9) src/ubuntu/ubuntusettingswidget.cpp (+6/-0) src/ubuntu/ubuntusettingswidget.ui (+16/-0) |
| To merge this branch: | bzr merge lp://staging/~juhapekka-piiroinen/qtcreator-plugin-ubuntu/backport-fix-1227618 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Approve | |
| Timo Jyrinki | Pending | ||
|
Review via email:
|
|||
Description of the change
Bug #1227618: If no device is present, try to use the system package to detect security policy groups, else, manual entry
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:34
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://