Merge lp:~tpeeters/ubuntu-ui-toolkit/tabbar-expose into lp:ubuntu-ui-toolkit
Proposed by
Tim Peeters
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Tim Peeters | ||||||||
Approved revision: | 678 | ||||||||
Merged at revision: | 671 | ||||||||
Proposed branch: | lp:~tpeeters/ubuntu-ui-toolkit/tabbar-expose | ||||||||
Merge into: | lp:ubuntu-ui-toolkit | ||||||||
Diff against target: |
226 lines (+65/-60) 7 files modified
components.api (+2/-0) modules/Ubuntu/Components/TabBar.qml (+19/-1) modules/Ubuntu/Components/Tabs.qml (+0/-1) modules/Ubuntu/Components/Themes/Ambiance/TabBarStyle.qml (+11/-5) tests/resources/navigation/MyCustomPage.qml (+2/-0) tests/resources/navigation/StackWithTabs.qml (+31/-3) tests/resources/tabs/MyCustomPage.qml (+0/-50) |
||||||||
To merge this branch: | bzr merge lp:~tpeeters/ubuntu-ui-toolkit/tabbar-expose | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Cris Dywan | Approve | ||
Review via email: mp+178066@code.launchpad.net |
Commit message
Add bool properties alwaysSelectionMode and animate to TabBar for greater control of its behavior.
To post a comment you must log in.
FAILED: Continuous integration, rev:675 jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- ci/448/ jenkins. qa.ubuntu. com/job/ generic- mediumtests- saucy/1780/ console jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- saucy-amd64- ci/305/ console jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- saucy-armhf- ci/305/ console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- saucy/1785/ console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ ubuntu- ui-toolkit- ci/448/ rebuild
http://