Merge lp://staging/~bzoltan/ubuntu-ui-toolkit/OTA13-2016-06-29 into lp://staging/ubuntu-ui-toolkit

Proposed by Zoltan Balogh
Status: Merged
Approved by: Zoltan Balogh
Approved revision: no longer in the source branch.
Merged at revision: 1347
Proposed branch: lp://staging/~bzoltan/ubuntu-ui-toolkit/OTA13-2016-06-29
Merge into: lp://staging/ubuntu-ui-toolkit
Diff against target: 5506 lines (+2586/-907) (has conflicts)
103 files modified
README (+35/-0)
components.api (+10/-0)
debian/changelog (+70/-0)
documentation/docs.sh (+13/-5)
documentation/ubuntu-ui-toolkit-indexes.qdocconf (+9/-0)
documentation/ubuntu-ui-toolkit-offline-indexes.qdocconf (+2/-11)
documentation/ubuntu-ui-toolkit-online-indexes.qdocconf (+2/-0)
examples/ubuntu-ui-toolkit-gallery/Buttons.qml (+8/-8)
src/Ubuntu/Components/1.3/ComboButton.qml (+13/-0)
src/Ubuntu/Components/1.3/PageHeader.qml (+6/-0)
src/Ubuntu/Components/1.3/Scrollbar.qml (+35/-21)
src/Ubuntu/Components/Popups/1.3/ActionSelectionPopover.qml (+2/-0)
src/Ubuntu/Components/Styles/1.3/ActionBarStyle.qml (+12/-2)
src/Ubuntu/Components/Styles/1.3/ActionItemProperties.qml (+56/-0)
src/Ubuntu/Components/Styles/1.3/PageHeaderStyle.qml (+7/-0)
src/Ubuntu/Components/Styles/Styles.pro (+1/-0)
src/Ubuntu/Components/Styles/qmldir (+1/-0)
src/Ubuntu/Components/Themes/Ambiance/1.3/ActionBarStyle.qml (+36/-6)
src/Ubuntu/Components/Themes/Ambiance/1.3/ComboButtonStyle.qml (+5/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml (+1/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml (+19/-2)
src/Ubuntu/Components/Themes/Ambiance/1.3/ScrollbarStyle.qml (+38/-18)
src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml (+2/-0)
src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro (+4/-2)
src/Ubuntu/UbuntuToolkit/privates/listviewextensions.cpp (+6/-4)
src/Ubuntu/UbuntuToolkit/privates/threelabelsslot_p.cpp (+6/-0)
src/Ubuntu/UbuntuToolkit/privates/ucpagewrapper.cpp (+15/-2)
src/Ubuntu/UbuntuToolkit/privates/ucscrollbarutils.cpp (+44/-0)
src/Ubuntu/UbuntuToolkit/privates/ucscrollbarutils_p.h (+41/-0)
src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp (+4/-0)
src/Ubuntu/UbuntuToolkit/ucabstractbutton.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/ucbottomedgeregion.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/uclistitem.cpp (+1/-1)
src/Ubuntu/UbuntuToolkit/uclistitemlayout.cpp (+97/-5)
src/Ubuntu/UbuntuToolkit/ucslotslayout.cpp (+2/-2)
src/Ubuntu/UbuntuToolkit/ucstyleditembase_p.h (+1/-1)
src/Ubuntu/UbuntuToolkit/ucstylehints.cpp (+6/-3)
src/Ubuntu/UbuntuToolkit/ucunits.cpp (+15/-17)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_actionbar.py (+3/-0)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_header.py (+3/-0)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_optionselector.py (+3/-3)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/_toolbar.py (+1/-2)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py (+6/-1)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.ToggleTestCase.test_with_checkbox.qml (+31/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.ToggleTestCase.test_with_switch.qml (+31/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_checkbox.py (+13/-41)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_common.py (+2/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.DatePickerBaseTestCase.qml (+72/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_date_picker.py (+7/-60)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.IsFlickableTestCase.qml (+34/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.SwipeFlickableTestCase.qml (+83/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.UnityFlickableTestCase.qml (+31/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable.py (+18/-109)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable_uitk10.IsFlickableTestCase.qml (+35/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable_uitk10.SwipeFlickableTestCase.qml (+62/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable_uitk10.UnityFlickableTestCase.qml (+30/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_flickable_uitk10.py (+18/-90)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.SwipeToDeleteTestCase.qml (+79/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitems.py (+6/-68)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.GoBackTestCase.back_in_header.qml (+48/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.GoBackTestCase.back_in_toolbar.qml (+48/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.MainView10TestCase.qml (+24/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.MainView12TestCase.qml (+24/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_main_view.py (+25/-67)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_optionselector.OptionSelectorCustomDelegateTestCase.qml (+60/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_optionselector.OptionSelectorTestCase.qml (+42/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_optionselector.py (+18/-82)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.ActionSelectionPopoverTestCase.qml (+2/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.ComposerSheetTestCase.qml (+52/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_popups.py (+11/-43)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.QQuickListViewOutOfViewTestCase.qml (+62/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_qquicklistview.py (+5/-49)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.TextAreaTestCase.qml (+30/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_textarea.py (+7/-18)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_toolbar.ToolbarTestCase.qml (+49/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_toolbar.py (+7/-37)
tests/autopilot/ubuntuuitoolkit/tests/gallery/__init__.py (+0/-20)
tests/autopilot/ubuntuuitoolkit/tests/gallery/test_optionselector.py (+5/-3)
tests/autopilot/ubuntuuitoolkit/tests/test_launcher.py (+12/-0)
tests/autopilot/ubuntuuitoolkit/tests/test_launcher.testcase.qml (+1/-1)
tests/autopilot/ubuntuuitoolkit/tests/test_launcher.window.qml (+43/-0)
tests/unit/README (+0/-4)
tests/unit/bottomedge/ExternalContent.qml (+27/-0)
tests/unit/bottomedge/PreloadContentUrl.qml (+35/-0)
tests/unit/bottomedge/bottomedge.pro (+3/-1)
tests/unit/bottomedge/tst_bottomedge.cpp (+10/-0)
tests/unit/subtheming/GroupPropertyValueHints.qml (+33/-0)
tests/unit/subtheming/StyleHintsInvalidGroupedProperty.qml (+30/-0)
tests/unit/subtheming/subtheming.pro (+2/-0)
tests/unit/subtheming/tst_subtheming.cpp (+7/-1)
tests/unit/units/dpr1/tst_units.cpp (+2/-2)
tests/unit/units/dpr2/tst_units_dpr2.cpp (+2/-0)
tests/unit/units/dpr3/tst_units_dpr3.cpp (+2/-0)
tests/unit/visual/tst_actionbar.13.qml (+78/-17)
tests/unit/visual/tst_adaptivepagelayout_param.13.qml (+62/-0)
tests/unit/visual/tst_combobutton.13.qml (+23/-10)
tests/unit/visual/tst_focus.13.qml (+8/-2)
tests/unit/visual/tst_listitem.12.qml (+1/-1)
tests/unit/visual/tst_listitem.13.qml (+1/-1)
tests/unit/visual/tst_listitem_focus.13.qml (+241/-22)
tests/unit/visual/tst_pageheader.13.qml (+31/-1)
tests/unit/visual/tst_scrollbar.13.qml (+135/-12)
ubuntu-ui-toolkit-launcher/launcher.cpp (+83/-25)
Text conflict in debian/changelog
To merge this branch: bzr merge lp://staging/~bzoltan/ubuntu-ui-toolkit/OTA13-2016-06-29
Reviewer Review Type Date Requested Status
Zoltan Balogh Approve
Review via email: mp+301493@code.staging.launchpad.net

Commit message

Landing OTA13-2016-06-29

Description of the change

Landing OTA13-2016-06-29

To post a comment you must log in.
Revision history for this message
Zoltan Balogh (bzoltan) :
review: Approve
2045. By Zoltan Balogh

update from staging

2046. By Zoltan Balogh

Update from staging

2047. By Zoltan Balogh

Sync with staging

2048. By Zoltan Balogh

Sync with staging

2049. By Zoltan Balogh

Use safe qstrcmp: typeName() can be 0

2050. By Zoltan Balogh

Update from staging

2051. By Zoltan Balogh

Update from staging

2052. By Zoltan Balogh

Update from staging

2053. By Zoltan Balogh

Update from staging

2054. By Zoltan Balogh

sync with staging

2055. By Zoltan Balogh

sync with staging

2056. By Zoltan Balogh

update from staging

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: