lp:~zsombi/ubuntu-ui-toolkit/50-custom-delegates

Branch merges

Propose for merging

No branches dependent on this one.

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

Tim Peeters: Approve on 2014-11-28

Diff: 215 lines (+107/-7)

6 files modified

modules/Ubuntu/Components/Themes/Ambiance/ListItemPanel.qml (+3/-1)
modules/Ubuntu/Components/plugin/uclistitem.cpp (+1/-1)
modules/Ubuntu/Components/plugin/uclistitemactions.cpp (+63/-4)
modules/Ubuntu/Components/plugin/uclistitemactionsattached.cpp (+1/-1)
tests/resources/listitems/ListItemTest.qml (+16/-0)
tests/unit_x11/tst_components/tst_listitem.qml (+23/-0)

api

Superseded for merging into lp:~bzoltan/ubuntu-ui-toolkit/new_list_item

Ubuntu SDK team: Pending requested 2014-09-15

Diff: 150 lines (+87/-0)

4 files modified

modules/Ubuntu/Components/ListItemPanel.qml (+1/-0)
modules/Ubuntu/Components/plugin/uclistitemoptions.cpp (+56/-0)
tests/resources/listitems/ListItemTest.qml (+16/-0)
tests/unit_x11/tst_components/tst_listitem.qml (+14/-0)

api

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

Ubuntu SDK team: Pending requested 2014-08-28

Diff: 150 lines (+87/-0)

4 files modified

modules/Ubuntu/Components/ListItemPanel.qml (+1/-0)
modules/Ubuntu/Components/plugin/uclistitemoptions.cpp (+56/-0)
tests/resources/listitems/ListItemTest.qml (+16/-0)
tests/unit_x11/tst_components/tst_listitem.qml (+14/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1291. By Zsombor Egri on 2014-11-27

review comments added

1290. By Zsombor Egri on 2014-11-25

remove typo from property documentation

1289. By Zsombor Egri on 2014-11-25

prereq sync

1288. By Zsombor Egri on 2014-11-25

more documentation fixes

1287. By Zsombor Egri on 2014-11-25

documentation link fixed

1286. By Zsombor Egri on 2014-11-25

documentation link fixed

1285. By Zsombor Egri on 2014-11-25

prereq sync

1284. By Zsombor Egri on 2014-11-24

prereq sync

1283. By Zsombor Egri on 2014-11-24

prereq sync

1282. By Zsombor Egri on 2014-11-24

prereq sync