Merge lp:~tpeeters/ubuntu-ui-toolkit/buttonAction into lp:ubuntu-ui-toolkit
Proposed by
Tim Peeters
Status: | Merged |
---|---|
Approved by: | Zsombor Egri |
Approved revision: | 522 |
Merged at revision: | 518 |
Proposed branch: | lp:~tpeeters/ubuntu-ui-toolkit/buttonAction |
Merge into: | lp:ubuntu-ui-toolkit |
Diff against target: |
270 lines (+94/-32) 6 files modified
components.api (+1/-0) modules/Ubuntu/Components/AbstractButton.qml (+20/-7) modules/Ubuntu/Components/Button.qml (+20/-9) modules/Ubuntu/Components/Toolbar.qml (+15/-16) tests/unit/tst_components/tst_abstractbutton.qml (+16/-0) tests/unit/tst_components/tst_button.qml (+22/-0) |
To merge this branch: | bzr merge lp:~tpeeters/ubuntu-ui-toolkit/buttonAction |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zsombor Egri | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+165563@code.launchpad.net |
Commit message
Add action property to AbstractButton, and use it in the toolbar.
Description of the change
Add action property to AbstractButton, and use it in the toolbar.
To post a comment you must log in.
PASSED: Continuous integration, rev:520 jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- ci/119/ jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- raring- amd64-ci/ 119 jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- raring- armhf-ci/ 119 jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- raring- armhf-ci/ 119/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ ubuntu- ui-toolkit- ci/119/ rebuild
http://