Merge lp://staging/~faenil/ubuntu-ui-toolkit/listitemlayout_fixes_and_docs into lp://staging/ubuntu-ui-toolkit/staging
Proposed by
Andrea Bernabei
Status: | Merged |
---|---|
Approved by: | Zsombor Egri |
Approved revision: | 1798 |
Merged at revision: | 1800 |
Proposed branch: | lp://staging/~faenil/ubuntu-ui-toolkit/listitemlayout_fixes_and_docs |
Merge into: | lp://staging/ubuntu-ui-toolkit/staging |
Diff against target: |
289 lines (+140/-14) 4 files modified
src/Ubuntu/Components/plugin/privates/threelabelsslot_p.cpp (+10/-7) src/Ubuntu/Components/plugin/privates/threelabelsslot_p.h (+3/-1) src/Ubuntu/Components/plugin/uclistitemlayout.cpp (+80/-4) tests/unit_x11/tst_components/tst_slotslayout.qml (+47/-2) |
To merge this branch: | bzr merge lp://staging/~faenil/ubuntu-ui-toolkit/listitemlayout_fixes_and_docs |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zsombor Egri | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+281919@code.staging.launchpad.net |
Commit message
Fix ListItemLayout multiline labels positioning and add docs about aliasing labels properties
Visual changes reviewed by Jouni Helminen
To post a comment you must log in.
PASSED: Continuous integration, rev:1798 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/2703/ jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- vivid-amd64- ci/1426 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- vivid-armhf- ci/1429 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- vivid-armhf- ci/1429/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- vivid-i386- ci/1425
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/2703/ rebuild
http://