Merge lp:~zsombi/ubuntu-ui-toolkit/fixThemingFallback into lp:ubuntu-ui-toolkit/staging
Proposed by
Zsombor Egri
Status: | Merged |
---|---|
Approved by: | Zoltan Balogh |
Approved revision: | 1675 |
Merged at revision: | 1676 |
Proposed branch: | lp:~zsombi/ubuntu-ui-toolkit/fixThemingFallback |
Merge into: | lp:ubuntu-ui-toolkit/staging |
Diff against target: |
110 lines (+8/-36) 3 files modified
src/Ubuntu/Components/plugin/ucstyleditembase.cpp (+5/-8) src/Ubuntu/Components/plugin/ucstyleditembase_p.h (+1/-0) tests/unit_x11/tst_subtheming/tst_subtheming.cpp (+2/-28) |
To merge this branch: | bzr merge lp:~zsombi/ubuntu-ui-toolkit/fixThemingFallback |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zoltan Balogh | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+273497@code.launchpad.net |
Commit message
StyledItem does no longer fall back to 1.2 style loading on mixed import versions.
Description of the change
StyledItem does no longer fall back to 1.2 style loading on mixed import versions.
To post a comment you must log in.
PASSED: Continuous integration, rev:1675 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- ci/2362/ jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- vivid-amd64- ci/1090 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- vivid-armhf- ci/1092 jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- vivid-armhf- ci/1092/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ ubuntu- sdk-team- ubuntu- ui-toolkit- staging- vivid-i386- ci/1089
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/2362/ rebuild
http://