lp://qastaging/~zsombi/ubuntu-ui-toolkit/listitem_expansion

Branch merges

Propose for merging

1 branch dependent on this one.

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

Cris Dywan: Approve on 2015-09-04

PS Jenkins bot: Approve (continuous-integration) on 2015-09-04

Zsombor Egri: Approve on 2015-09-02

Diff: 2757 lines (+2288/-49)

21 files modified

components.api (+13/-0)
src/Ubuntu/Components/Themes/Ambiance/1.2/ListItemStyle.qml (+14/-1)
src/Ubuntu/Components/Themes/Ambiance/1.3/ListItemStyle.qml (+65/-0)
src/Ubuntu/Components/plugin/plugin.cpp (+2/-0)
src/Ubuntu/Components/plugin/plugin.pri (+1/-0)
src/Ubuntu/Components/plugin/privates/listitemdragarea.cpp (+2/-3)
src/Ubuntu/Components/plugin/privates/listitemdragarea.h (+1/-1)
src/Ubuntu/Components/plugin/privates/listitemexpansion.cpp (+106/-0)
src/Ubuntu/Components/plugin/uclistitem.cpp (+128/-6)
src/Ubuntu/Components/plugin/uclistitem.h (+76/-1)
src/Ubuntu/Components/plugin/uclistitem_p.h (+14/-5)
src/Ubuntu/Components/plugin/uclistitemstyle.cpp (+38/-9)
src/Ubuntu/Components/plugin/uclistitemstyle.h (+6/-0)
src/Ubuntu/Components/plugin/ucviewitemsattached.cpp (+141/-1)
tests/resources/listitems/ListItemExpansion.qml (+121/-0)
tests/unit_x11/tst_components/ListItemTestCase.qml (+5/-0)
tests/unit_x11/tst_components/ListItemTestCase13.qml (+143/-0)
tests/unit_x11/tst_components/tst_listitem.qml (+1/-21)
tests/unit_x11/tst_components/tst_listitem13.qml (+1211/-0)
tests/unit_x11/tst_components/tst_listitem_expansion.qml (+199/-0)
tests/unit_x11/tst_components/tst_listitem_extras.qml (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1641. By Zsombor Egri on 2015-09-04

API updated

1640. By Zsombor Egri on 2015-09-04

Completion handled in style; refinement on the UnlockExpanded handling; minor improvement on overridden slots

1639. By Zsombor Egri on 2015-09-04

LockExpanded changed into UnlockExpanded, documentation updated

1638. By Zsombor Egri on 2015-09-04

commented code removed

1637. By Zsombor Egri on 2015-09-02

commented out import breaking tests restored

1636. By Zsombor Egri on 2015-09-02

API updated

1635. By Zsombor Egri on 2015-09-02

staging merge

1634. By Zsombor Egri on 2015-09-02

1.3 specific tests

1633. By Zsombor Egri on 2015-09-02

1.2 fixed

1632. By Zsombor Egri on 2015-09-02

separate 1.2 tests from 1.3