Merge lp:~zsombi/ubuntu-ui-toolkit/labelChildFixTrunk into lp:ubuntu-ui-toolkit
Proposed by
Zsombor Egri
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Zoltan Balogh | ||||
Approved revision: | 1240 | ||||
Merged at revision: | 1240 | ||||
Proposed branch: | lp:~zsombi/ubuntu-ui-toolkit/labelChildFixTrunk | ||||
Merge into: | lp:ubuntu-ui-toolkit | ||||
Diff against target: |
72 lines (+55/-2) 2 files modified
src/Ubuntu/Components/plugin/ucthemingextension.cpp (+6/-2) tests/unit_x11/tst_components/tst_label_extras.qml (+49/-0) |
||||
To merge this branch: | bzr merge lp:~zsombi/ubuntu-ui-toolkit/labelChildFixTrunk | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cris Dywan | Approve | ||
Review via email: mp+273814@code.launchpad.net |
Commit message
Fix corner case on Label having styled item.
Description of the change
Fix corner case on Label having styled item.
To post a comment you must log in.
This makes sense indeed seeing that there is no 'theme' property in the case of the Label and Theme* would be null. Good catch!