Merge lp://qastaging/~bzoltan/ubuntu-ui-toolkit/Landing-2017-03-06 into lp://qastaging/ubuntu-ui-toolkit

Proposed by Zoltan Balogh
Status: Merged
Approved by: Zoltan Balogh
Approved revision: no longer in the source branch.
Merged at revision: 1389
Proposed branch: lp://qastaging/~bzoltan/ubuntu-ui-toolkit/Landing-2017-03-06
Merge into: lp://qastaging/ubuntu-ui-toolkit
Diff against target: 1395 lines (+474/-143)
41 files modified
components.api (+1/-0)
debian/changelog (+40/-0)
examples/ubuntu-ui-toolkit-gallery/Toggles.qml (+43/-0)
src/UbuntuToolkit/menu.cpp (+2/-1)
src/UbuntuToolkit/menubar.cpp (+2/-1)
src/UbuntuToolkit/menugroup.cpp (+2/-1)
src/UbuntuToolkit/privates/uccontenthub.cpp (+45/-45)
src/UbuntuToolkit/privates/uccontenthub_p.h (+17/-14)
src/UbuntuToolkit/sortfiltermodel.cpp (+5/-2)
src/UbuntuToolkit/ucapplication.cpp (+0/-3)
src/UbuntuToolkit/ucmainwindow.cpp (+9/-7)
src/UbuntuToolkit/ucmainwindow_p.h (+2/-0)
src/UbuntuToolkit/ucqquickimageextension.cpp (+53/-2)
src/UbuntuToolkit/ucqquickimageextension_p.h (+1/-0)
src/UbuntuToolkit/ucslotslayout.cpp (+1/-0)
src/UbuntuToolkit/ucstylehints.cpp (+1/-0)
src/imports/Components/1.3/ListItemPopover.qml (+2/-1)
src/imports/Components/1.3/OptionSelector.qml (+6/-0)
src/imports/Components/1.3/TextField.qml (+6/-1)
src/imports/Components/1.3/UbuntuListView.qml (+1/-0)
src/imports/Components/ListItems/1.3/LabelVisual.qml (+2/-1)
src/imports/Components/ListItems/1.3/ThinDivider.qml (+2/-2)
src/imports/Components/Popups/1.3/popupUtils.js (+1/-1)
src/imports/Components/Themes/Ambiance/1.3/CheckBoxStyle.qml (+17/-3)
src/imports/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml (+2/-1)
tests/autopilot/ubuntuuitoolkit/_custom_proxy_objects/popups.py (+2/-0)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.ListItemTestCase.qml (+9/-2)
tests/autopilot/ubuntuuitoolkit/tests/custom_proxy_objects/test_listitem.py (+13/-1)
tests/unit/components/tst_sortfiltermodel.qml (+14/-3)
tests/unit/contenthub/tst_contenthub.cpp (+17/-22)
tests/unit/mainwindow/VisualRoot.qml (+0/-1)
tests/unit/mainwindow/tst_mainwindow.cpp (+33/-10)
tests/unit/qquick_image_extension/borderInName.sci (+0/-7)
tests/unit/qquick_image_extension/data/borderInName.sci (+7/-0)
tests/unit/qquick_image_extension/data/hundred_faces.qml (+13/-0)
tests/unit/qquick_image_extension/data/test@18.sci (+7/-0)
tests/unit/qquick_image_extension/qquick_image_extension.pro (+1/-1)
tests/unit/qquick_image_extension/test@18.sci (+0/-7)
tests/unit/qquick_image_extension/tst_qquick_image_extension.cpp (+38/-3)
tests/unit/visual/tst_optionselector.13.qml (+9/-0)
tests/unit/visual/tst_toggles.13.qml (+48/-0)
To merge this branch: bzr merge lp://qastaging/~bzoltan/ubuntu-ui-toolkit/Landing-2017-03-06
Reviewer Review Type Date Requested Status
Zoltan Balogh Approve
Review via email: mp+319093@code.qastaging.launchpad.net

Commit message

landing

Description of the change

landing

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

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: