lp:~zsombi/ubuntu-ui-toolkit/10-viewitem

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~zsombi/ubuntu-ui-toolkit/listitem-master at revision 1266

Zsombor Egri: Approve (continuous-integration) on 2014-09-18

Tim Peeters: Pending requested 2014-09-18

Diff: 987 lines (+855/-11)

15 files modified

components.api (+10/-0)
documentation/overview.qdoc (+5/-0)
modules/Ubuntu/Components/plugin/plugin.cpp (+4/-0)
modules/Ubuntu/Components/plugin/plugin.pro (+5/-2)
modules/Ubuntu/Components/plugin/uclistitem.cpp (+345/-0)
modules/Ubuntu/Components/plugin/uclistitem.h (+72/-0)
modules/Ubuntu/Components/plugin/uclistitem_p.h (+56/-0)
tests/resources/listitems/ListItemTest.qml (+84/-0)
tests/unit/tst_performance/ItemList.qml (+30/-0)
tests/unit/tst_performance/ListItemList.qml (+28/-0)
tests/unit/tst_performance/ListItemsBaseList.qml (+29/-0)
tests/unit/tst_performance/ListItemsEmptyList.qml (+29/-0)
tests/unit/tst_performance/tst_performance.cpp (+4/-8)
tests/unit/tst_performance/tst_performance.pro (+5/-1)
tests/unit_x11/tst_components/tst_listitem.qml (+149/-0)

api

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

PS Jenkins bot: Needs Fixing (continuous-integration) on 2014-09-04

Tim Peeters: Pending requested 2014-09-02

Diff: 1352 lines (+912/-117)

24 files modified

components.api (+53/-17)
debian/qtdeclarative5-ubuntu-ui-toolkit-plugin.install (+0/-1)
modules/Ubuntu/Components/10/UbuntuColors10.qml (+1/-0)
modules/Ubuntu/Components/11/UbuntuColors.qml (+1/-0)
modules/Ubuntu/Components/Colors/Colors.pro (+0/-9)
modules/Ubuntu/Components/Colors/FIXME (+0/-7)
modules/Ubuntu/Components/Components.pro (+1/-1)
modules/Ubuntu/Components/Pickers/PickerPanel.qml (+1/-0)
modules/Ubuntu/Components/Pickers/qmldir (+2/-0)
modules/Ubuntu/Components/plugin/plugin.cpp (+13/-50)
modules/Ubuntu/Components/plugin/plugin.h (+6/-2)
modules/Ubuntu/Components/plugin/plugin.pro (+5/-2)
modules/Ubuntu/Components/plugin/uclistitem.cpp (+352/-0)
modules/Ubuntu/Components/plugin/uclistitem.h (+62/-0)
modules/Ubuntu/Components/plugin/uclistitem_p.h (+87/-0)
modules/Ubuntu/Components/qmldir (+3/-0)
tests/qmlapicheck.py (+22/-18)
tests/qmlapicheck.sh (+1/-1)
tests/resources/listitems/ListItemTest.qml (+90/-0)
tests/unit/tst_performance/ItemList.qml (+30/-0)
tests/unit/tst_performance/ListItemList.qml (+28/-0)
tests/unit/tst_performance/tst_performance.cpp (+2/-8)
tests/unit/tst_performance/tst_performance.pro (+3/-1)
tests/unit_x11/tst_components/tst_listitem.qml (+149/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1214. By Zsombor Egri on 2014-11-19

staging sync

1213. By Zsombor Egri on 2014-11-06

staging merge

1212. By Zsombor Egri on 2014-11-04

staging sync

1211. By Zsombor Egri on 2014-10-24

staging sync

1210. By Zsombor Egri on 2014-10-18

staging sync

1209. By Zsombor Egri on 2014-10-18

fix activeFocusOnSet defaulting and setFocused override

1208. By Zsombor Egri on 2014-10-13

staging sync

1207. By Zsombor Egri on 2014-10-02

API updated

1206. By Zsombor Egri on 2014-10-02

pressedColor changed into highlightColor

1205. By Zsombor Egri on 2014-10-02

staging sync