lp:~tpeeters/ubuntu-ui-toolkit/98-DeprecateHeader

Branch merges

Propose for merging

No branches dependent on this one.

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

PS Jenkins bot: Needs Fixing (continuous-integration) on 2014-06-27

Cris Dywan: Approve on 2014-06-26

Zsombor Egri: Pending requested 2014-06-25

Diff: 411 lines (+137/-33)

17 files modified

components.api (+2/-12)
modules/Ubuntu/Components/AppHeader.qml (+1/-1)
modules/Ubuntu/Components/Header.qml (+39/-0)
modules/Ubuntu/Components/MainView.qml (+2/-2)
modules/Ubuntu/Components/Page.qml (+2/-2)
modules/Ubuntu/Components/PageTreeNode.qml (+4/-3)
modules/Ubuntu/Components/Tabs.qml (+1/-1)
modules/Ubuntu/Components/qmldir (+1/-0)
tests/autopilot/ubuntuuitoolkit/__init__.py (+2/-0)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/__init__.py (+5/-1)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py (+14/-3)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py (+3/-2)
tests/autopilot/ubuntuuitoolkit/tests/__init__.py (+1/-1)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.DeprecatedHeaderTestCase.qml (+27/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py (+29/-2)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.py (+2/-1)
tests/unit/tst_components/tst_pagestack.qml (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1125. By Tim Peeters on 2014-06-26

merge staging

1124. By Tim Peeters on 2014-06-26

merge staging

1123. By Tim Peeters on 2014-06-25

merge pre-requisite

1122. By Tim Peeters on 2014-06-25

merge staging

1121. By Tim Peeters on 2014-06-23

merge staging

1120. By Tim Peeters on 2014-06-19

formatting

1119. By Tim Peeters on 2014-06-19

fix deprecation test

1118. By Tim Peeters on 2014-06-19

merge staging

1117. By Tim Peeters on 2014-06-19

merge staging

1116. By Tim Peeters on 2014-06-19

fix docs