lp:~nick-dedekind/ubuntu-ui-toolkit/exclusiveGroup

Branch merges

Propose for merging

No branches dependent on this one.

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

ubuntu-sdk-build-bot: Approve (continuous-integration) on 2016-08-23

Zoltan Balogh: Approve on 2016-08-23

Zsombor Egri: Approve on 2016-08-18

PS Jenkins bot: Pending (continuous-integration) requested 2016-06-20

Diff: 1025 lines (+720/-56)

13 files modified

components.api (+14/-3)
src/Ubuntu/Components/1.3/ActionList.qml (+0/-47)
src/Ubuntu/Components/ComponentModule.pro (+0/-1)
src/Ubuntu/Components/qmldir (+0/-1)
src/Ubuntu/UbuntuToolkit/UbuntuToolkit.pro (+6/-2)
src/Ubuntu/UbuntuToolkit/actionlist.cpp (+158/-0)
src/Ubuntu/UbuntuToolkit/actionlist_p.h (+58/-0)
src/Ubuntu/UbuntuToolkit/exclusivegroup.cpp (+168/-0)
src/Ubuntu/UbuntuToolkit/exclusivegroup_p.h (+62/-0)
src/Ubuntu/UbuntuToolkit/ubuntutoolkitmodule.cpp (+4/-0)
src/Ubuntu/UbuntuToolkit/ucaction.cpp (+124/-0)
src/Ubuntu/UbuntuToolkit/ucaction_p.h (+19/-1)
tests/unit/components/tst_action.qml (+107/-1)

api

Superseded for merging into lp:ubuntu-ui-toolkit

Zoltan Balogh: Needs Fixing on 2016-06-16

Zsombor Egri: Needs Fixing on 2016-06-16

PS Jenkins bot: Pending (continuous-integration) requested 2016-06-08

Diff: 773 lines (+434/-109)

13 files modified

components.api (+11/-6)
src/Ubuntu/Components/1.2/ActionList.qml (+0/-47)
src/Ubuntu/Components/1.3/ActionList.qml (+0/-47)
src/Ubuntu/Components/ComponentModule.pro (+0/-2)
src/Ubuntu/Components/plugin/plugin.cpp (+4/-0)
src/Ubuntu/Components/plugin/plugin.pri (+6/-2)
src/Ubuntu/Components/plugin/ucaction.cpp (+50/-0)
src/Ubuntu/Components/plugin/ucaction.h (+15/-2)
src/Ubuntu/Components/plugin/ucactionlist.cpp (+111/-0)
src/Ubuntu/Components/plugin/ucactionlist.h (+53/-0)
src/Ubuntu/Components/plugin/ucexclusivegroup.cpp (+131/-0)
src/Ubuntu/Components/plugin/ucexclusivegroup.h (+53/-0)
src/Ubuntu/Components/qmldir (+0/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1353. By Nick Dedekind on 2016-08-22

fixed include

1352. By Nick Dedekind on 2016-08-19

updated components.api

1351. By Nick Dedekind on 2016-08-19

added signal parameter name

1350. By Nick Dedekind on 2016-08-19

merged staging

1349. By Nick Dedekind on 2016-08-18

merged with staging

1348. By Nick Dedekind on 2016-08-18

added more includes

1347. By Nick Dedekind on 2016-08-17

updated components.api

1346. By Nick Dedekind on 2016-08-17

added include

1345. By Nick Dedekind on 2016-08-12

merged with trunk

1344. By Nick Dedekind on 2016-07-18

moved cpp&h