lp:~tpeeters/ubuntu-ui-toolkit/20-tabbarInStyle

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu-ui-toolkit/staging at revision 1018

PS Jenkins bot: Approve (continuous-integration) on 2014-04-24

Zsombor Egri: Approve on 2014-04-24

Diff: 336 lines (+73/-46)

10 files modified

CHANGES (+2/-0)
components.api (+2/-0)
modules/Ubuntu/Components/Header.qml (+16/-3)
modules/Ubuntu/Components/MainView.qml (+3/-6)
modules/Ubuntu/Components/Tabs.qml (+13/-14)
modules/Ubuntu/Components/Themes/Ambiance/HeaderStyle.qml (+23/-1)
tests/resources/navigation/TabView.qml (+1/-9)
tests/unit/tst_components/tst_pagestack.qml (+3/-3)
tests/unit_x11/tst_components/tst_hide_chrome.qml (+1/-1)
tests/unit_x11/tst_components/tst_tabs.qml (+9/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1292601: Move TabBar to HeaderStyle

Critical

Fix Released

Link a bug report

Related blueprints

994. By Tim Peeters on 2014-04-24

merge staging

993. By Tim Peeters on 2014-04-23

update components.api

992. By Tim Peeters on 2014-04-23

fix model reference in tabs unit test

991. By Tim Peeters on 2014-04-23

merge staging

990. By Tim Peeters on 2014-04-23

fix toolbar/tabbar hiding

989. By Tim Peeters on 2014-04-23

merge staging

988. By Tim Peeters on 2014-04-22

link bug

987. By Tim Peeters on 2014-04-22

merge 10-tabsModelIndex

986. By Tim Peeters on 2014-04-15

update CHANGES

985. By Tim Peeters on 2014-04-15

remove unneeded Deprecated warning