Merge lp://staging/~canonical-platform-qa/ubuntu-ui-toolkit/fix1429163-nopy2 into lp://staging/ubuntu-ui-toolkit

components.api (+23/-1)
debian/control (+0/-12)
debian/rules (+1/-0)
debian/ubuntu-ui-toolkit-autopilot.install (+0/-1)
examples/ubuntu-ui-toolkit-gallery/WebLink.qml (+5/-0)
modules/Ubuntu/Components/AppHeader.qml (+104/-15)
modules/Ubuntu/Components/MainView.qml (+2/-1)
modules/Ubuntu/Components/MainView12.qml (+18/-8)
modules/Ubuntu/Components/Page10.qml (+3/-31)
modules/Ubuntu/Components/Page11.qml (+5/-3)
modules/Ubuntu/Components/Page13.qml (+84/-0)
modules/Ubuntu/Components/PageHeadConfiguration.qdoc (+202/-0)
modules/Ubuntu/Components/PageHeadConfiguration11.qml (+3/-155)
modules/Ubuntu/Components/PageHeadConfiguration13.qml (+30/-0)
modules/Ubuntu/Components/StyledItem.qml (+1/-1)
modules/Ubuntu/Components/Styles/PageHeadStyle.qml (+3/-3)
modules/Ubuntu/Components/Tab.qml (+20/-2)
modules/Ubuntu/Components/Tabs.qml (+4/-1)
modules/Ubuntu/Components/Themes/Ambiance/HeadDividerStyle.qml (+3/-0)
modules/Ubuntu/Components/Themes/Ambiance/OverflowPanel.qml (+119/-1)
modules/Ubuntu/Components/Themes/Ambiance/PageHeadButton.qml (+1/-1)
modules/Ubuntu/Components/Themes/Ambiance/PageHeadStyle.qml (+51/-187)
modules/Ubuntu/Components/pageUtils.js (+47/-0)
modules/Ubuntu/Components/plugin/plugin.cpp (+10/-3)
modules/Ubuntu/Components/plugin/plugin.pro (+6/-4)
modules/Ubuntu/Components/plugin/shaders/shape.vert (+2/-2)
modules/Ubuntu/Components/plugin/shaders/shapeoverlay.vert (+2/-2)
modules/Ubuntu/Components/plugin/ucdefaulttheme.cpp (+8/-8)
modules/Ubuntu/Components/plugin/ucdefaulttheme.h (+6/-6)
modules/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp (+122/-0)
modules/Ubuntu/Components/plugin/ucdeprecatedtheme.h (+53/-0)
modules/Ubuntu/Components/plugin/uclistitem.cpp (+7/-4)
modules/Ubuntu/Components/plugin/ucstyleditembase.cpp (+213/-2)
modules/Ubuntu/Components/plugin/ucstyleditembase.h (+7/-1)
modules/Ubuntu/Components/plugin/ucstyleditembase_p.h (+19/-1)
modules/Ubuntu/Components/plugin/uctheme.cpp (+229/-132)
modules/Ubuntu/Components/plugin/uctheme.h (+39/-19)
modules/Ubuntu/Components/qmldir (+5/-1)
modules/Ubuntu/Test/UbuntuTestCase.qml (+20/-2)
modules/Ubuntu/Test/plugin/uctestcase.h (+0/-1)
push_to_phone.sh (+0/-1)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_common.py (+2/-2)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py (+5/-2)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_mainview.py (+2/-2)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_textfield.py (+1/-1)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py (+0/-3)
tests/autopilot/ubuntuuitoolkit/base.py (+2/-2)
tests/autopilot/ubuntuuitoolkit/fixture_setup.py (+10/-10)
tests/autopilot/ubuntuuitoolkit/tests/__init__.py (+3/-3)
tests/autopilot/ubuntuuitoolkit/tests/components/test_header.py (+2/-2)
tests/autopilot/ubuntuuitoolkit/tests/components/test_popover.py (+1/-4)
tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py (+3/-3)
tests/autopilot/ubuntuuitoolkit/tests/components/test_units.py (+61/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.py (+2/-5)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_common.py (+2/-5)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py (+2/-2)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_dialog.py (+1/-4)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py (+2/-5)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_header.py (+4/-4)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.py (+1/-1)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py (+3/-6)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py (+2/-5)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_optionselector.py (+3/-3)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.py (+1/-1)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_pull_to_refresh.py (+2/-2)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py (+4/-7)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_tabs.py (+2/-5)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py (+2/-5)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textfield.py (+2/-5)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_toolbar.py (+2/-5)
tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py (+3/-3)
tests/autopilot/ubuntuuitoolkit/tests/gallery/test_buttons.py (+1/-1)
tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py (+2/-2)
tests/autopilot/ubuntuuitoolkit/tests/gallery/test_scrollbar.py (+2/-2)
tests/autopilot/ubuntuuitoolkit/tests/gallery/test_textinput.py (+3/-3)
tests/autopilot/ubuntuuitoolkit/tests/gallery/test_toggles.py (+3/-3)
tests/autopilot/ubuntuuitoolkit/tests/test_fixture_setup.py (+4/-9)
tests/autopilot/ubuntuuitoolkit/tests/test_launcher.py (+1/-7)
tests/autopilot/ubuntuuitoolkit/tests/test_ubuntu_scenarios.py (+2/-5)
tests/autopilot/ubuntuuitoolkit/units.py (+38/-0)
tests/license/checklicense.sh (+16/-21)
tests/resources/header/actions.qml (+0/-47)
tests/resources/header/backButton.qml (+0/-59)
tests/resources/header/lockedToolbar.deprecated.qml (+0/-52)
tests/resources/header/sections.qml (+0/-41)
tests/resources/navigation/simpleTabs.qml (+0/-60)
tests/resources/subtheming/Simple.qml (+53/-0)
tests/uitk_test_plan.sh (+3/-1)
tests/unit/tst_components/tst_styleditem13.qml (+35/-0)
tests/unit/tst_performance/StyledItemOldTheming.qml (+72/-0)
tests/unit/tst_performance/Styling.qml (+76/-0)
tests/unit/tst_performance/tst_performance.cpp (+33/-4)
tests/unit/tst_performance/tst_performance.pro (+3/-1)
tests/unit_x11/tst_components/tst_app_theming.qml (+54/-0)
tests/unit_x11/tst_components/tst_components.pro (+2/-2)
tests/unit_x11/tst_components/tst_header_back_action.qml (+64/-21)
tests/unit_x11/tst_components/tst_header_contents_width.qml (+5/-10)
tests/unit_x11/tst_components/tst_header_sections.qml (+65/-56)
tests/unit_x11/tst_components/tst_header_visible.qml (+288/-0)
tests/unit_x11/tst_components/tst_page11.qml (+1/-1)
tests/unit_x11/tst_components/tst_page13.qml (+126/-0)
tests/unit_x11/tst_components/tst_pagestack.new_header.qml (+32/-40)
tests/unit_x11/tst_deprecated_theme_engine/Parent.qml (+14/-4)
tests/unit_x11/tst_deprecated_theme_engine/SimpleItem.qml (+20/-0)
tests/unit_x11/tst_deprecated_theme_engine/themes/CustomTheme/TestStyle.qml (+0/-1)
tests/unit_x11/tst_deprecated_theme_engine/themes/TestModule/TestTheme/TestStyle.qml (+0/-1)
tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.cpp (+113/-113)
tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro (+9/-2)
tests/unit_x11/tst_subtheming/DifferentThemes.qml (+46/-0)
tests/unit_x11/tst_subtheming/DynamicAssignment.qml (+38/-0)
tests/unit_x11/tst_subtheming/ParentChanges.qml (+37/-0)
tests/unit_x11/tst_subtheming/SimpleItem.qml (+30/-0)
tests/unit_x11/tst_subtheming/TestMain.qml (+39/-0)
tests/unit_x11/tst_subtheming/TestModule/TestTheme/TestStyle.qml (+20/-0)
tests/unit_x11/tst_subtheming/TestStyleChange.qml (+69/-0)
tests/unit_x11/tst_subtheming/themes/CustomTheme/TestStyle.qml (+22/-0)
tests/unit_x11/tst_subtheming/themes/CustomTheme/parent_theme (+1/-0)
tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/TestStyle.qml (+22/-0)
tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/parent_theme (+1/-0)
tests/unit_x11/tst_subtheming/themes/TestModule/TestTheme/qmldir (+2/-0)
tests/unit_x11/tst_subtheming/tst_subtheming.cpp (+496/-0)
tests/unit_x11/tst_subtheming/tst_subtheming.pro (+20/-0)
tests/unit_x11/tst_theme_engine/TestApp.qml (+0/-29)
tests/unit_x11/unit_x11.pro (+3/-2)