Merge lp:~tpeeters/ubuntu-ui-toolkit/stack-tabs into lp:ubuntu-ui-toolkit
Proposed by
Tim Peeters
Status: | Merged |
---|---|
Approved by: | Cris Dywan |
Approved revision: | 652 |
Merged at revision: | 649 |
Proposed branch: | lp:~tpeeters/ubuntu-ui-toolkit/stack-tabs |
Merge into: | lp:ubuntu-ui-toolkit |
Diff against target: |
223 lines (+141/-10) 5 files modified
modules/Ubuntu/Components/Tabs.qml (+54/-1) tests/resources/pagestack/MyCustomPage.qml (+3/-5) tests/resources/pagestack/PageStack.qml (+2/-2) tests/resources/pagestack/StackWithTabs.qml (+61/-0) tests/unit/tst_components/tst_pagestack.qml (+21/-2) |
To merge this branch: | bzr merge lp:~tpeeters/ubuntu-ui-toolkit/stack-tabs |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Cris Dywan | Approve | ||
Review via email: mp+176152@code.launchpad.net |
Commit message
Allow combination of Tabs and PageStack:
- Fix header behavior for Tabs inside PageStack
- Add test for Tabs inside PageStack header bug
- Replace deprecated components in PageStack tests
- Add test program that combines PageStack and Tabs
- Update Tabs documentation
Description of the change
Allow combination of Tabs and PageStack:
- Fix header behavior for Tabs inside PageStack
- Add test for Tabs inside PageStack header bug
- Replace deprecated components in PageStack tests
- Add test program that combines PageStack and Tabs
- Update Tabs documentation
To post a comment you must log in.
PASSED: Continuous integration, rev:646 jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- ci/384/ jenkins. qa.ubuntu. com/job/ generic- mediumtests- saucy/1421 jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- saucy-amd64- ci/241 jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- saucy-armhf- ci/241 jenkins. qa.ubuntu. com/job/ ubuntu- ui-toolkit- saucy-armhf- ci/241/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- saucy/1425 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- saucy/1425/ artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- mediumtests- runner- saucy/1215
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ ubuntu- ui-toolkit- ci/384/ rebuild
http://