Merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1257028 into lp:ubuntu-system-settings-online-accounts
Status: | Merged |
---|---|
Approved by: | Ken VanDine |
Approved revision: | 84 |
Merged at revision: | 84 |
Proposed branch: | lp:~mardy/ubuntu-system-settings-online-accounts/lp1257028 |
Merge into: | lp:ubuntu-system-settings-online-accounts |
Diff against target: |
110 lines (+29/-25) 5 files modified
src/module/ServiceItem.qml (+24/-18) src/module/ServiceSwitches.qml (+1/-1) src/qml/AccountItem.qml (+1/-3) src/qml/AccountsPage.qml (+2/-2) src/qml/ProvidersList.qml (+1/-1) |
To merge this branch: | bzr merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1257028 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
Use new iconName property for list items
Also, avoid using the deprecated model roles from accounts-
account -> accountHandle
accountService -> accountServiceH
Introducing a new Item as root item in the ServiceItem component is needed in
order to hide the Repeater's "model" property, which would otherwise conflict
with the homonymous context property in ServiceSwitches
Description of the change
Use new iconName property for list items
Also, avoid using the deprecated model roles from accounts-
account -> accountHandle
accountService -> accountServiceH
Introducing a new Item as root item in the ServiceItem component is needed in
order to hide the Repeater's "model" property, which would otherwise conflict
with the homonymous context property in ServiceSwitches
PASSED: Continuous integration, rev:84 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- online- accounts- ci/61/ jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- online- accounts- trusty- amd64-ci/ 9 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- online- accounts- trusty- armhf-ci/ 9 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- online- accounts- trusty- armhf-ci/ 9/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- online- accounts- trusty- i386-ci/ 9
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- system- settings- online- accounts- ci/61/rebuild
http://