lp:~mzanetti/ubuntu-ui-toolkit/100-headerAPI-check-undefined

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~tpeeters/ubuntu-ui-toolkit/100-headerAPI at revision 1111

Tim Peeters: Approve on 2014-06-25

Diff: 22 lines (+4/-1)

1 file modified

modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml (+4/-1)

api

Superseded for merging into lp:ubuntu-ui-toolkit/staging

Ubuntu SDK team: Pending requested 2014-06-25

Diff: 1104 lines (+435/-191)

25 files modified

components.api (+6/-11)
documentation/ubuntu-ui-toolkit-common.qdocconf (+1/-1)
examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml (+1/-1)
modules/Ubuntu/Components/AppHeader.qml (+8/-18)
modules/Ubuntu/Components/Header.qml (+68/-0)
modules/Ubuntu/Components/HeaderConfiguration.qml (+29/-0)
modules/Ubuntu/Components/MainView.qml (+41/-26)
modules/Ubuntu/Components/Page.qdoc (+120/-0)
modules/Ubuntu/Components/Page10.qml (+6/-103)
modules/Ubuntu/Components/Page11.qml (+24/-0)
modules/Ubuntu/Components/PageTreeNode.qml (+4/-3)
modules/Ubuntu/Components/Tabs.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/NewHeaderStyle.qml (+9/-6)
modules/Ubuntu/Components/qmldir (+6/-2)
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/resources/navigation/MyCustomPage.qml (+1/-1)
tests/resources/toolbar/header.qml (+25/-6)
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

1109. By Michael Zanetti on 2014-06-25

also check for undefined on external references

1108. By Tim Peeters on 2014-06-25

merge prerequisite

1107. By Tim Peeters on 2014-06-24

merge staging

1106. By Tim Peeters on 2014-06-24

don't rely on Page10 filename

1105. By Tim Peeters on 2014-06-23

update components.api

1104. By Tim Peeters on 2014-06-23

merge pre-requisite

1103. By Tim Peeters on 2014-06-23

docs

1102. By Tim Peeters on 2014-06-23

fix connection

1101. By Tim Peeters on 2014-06-20

empty

1100. By Tim Peeters on 2014-06-19

update docs