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

Branch merges

Propose for merging

No branches dependent on this one.

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

Tim Peeters: Needs Resubmitting on 2016-09-07

ubuntu-sdk-build-bot: Pending (continuous-integration) requested 2016-08-25

Zsombor Egri: Pending requested 2016-08-25

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

Diff: 1162 lines (+1148/-0) (has conflicts)

3 files modified

src/Ubuntu/UbuntuToolkit/menu.cpp.OTHER (+671/-0)
src/Ubuntu/UbuntuToolkit/menubar.cpp.OTHER (+340/-0)
tests/unit/components/tst_menu.qml.OTHER (+137/-0)

api

Superseded for merging into lp:ubuntu-ui-toolkit

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

Ubuntu SDK team: Pending requested 2016-06-07

Diff: 1803 lines (+1609/-45)

13 files modified

components.api (+23/-0)
src/Ubuntu/Components/plugin/plugin.cpp (+6/-0)
src/Ubuntu/Components/plugin/plugin.pri (+11/-3)
src/Ubuntu/Components/plugin/ucaction.cpp (+53/-37)
src/Ubuntu/Components/plugin/ucaction.h (+12/-5)
src/Ubuntu/Components/plugin/ucmenu.cpp (+671/-0)
src/Ubuntu/Components/plugin/ucmenu.h (+70/-0)
src/Ubuntu/Components/plugin/ucmenu_p.h (+90/-0)
src/Ubuntu/Components/plugin/ucmenubar.cpp (+336/-0)
src/Ubuntu/Components/plugin/ucmenubar.h (+60/-0)
src/Ubuntu/Components/plugin/ucmenubar_p.h (+73/-0)
src/Ubuntu/Components/plugin/ucmenugroup.cpp (+151/-0)
src/Ubuntu/Components/plugin/ucmenugroup.h (+53/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1359. By Nick Dedekind on 2016-08-25

fixed broken build

1358. By Nick Dedekind on 2016-08-25

merged staging

1357. By Nick Dedekind on 2016-08-22

merged parent

1356. By Nick Dedekind on 2016-07-18

moved menus to Labs

1355. By Nick Dedekind on 2016-07-18

removed uc prefix

1354. By Nick Dedekind on 2016-07-18

merged with trunk

1353. By Nick Dedekind on 2016-06-24

fixed namespace

1352. By Nick Dedekind on 2016-06-24

merged parent

1351. By Nick Dedekind on 2016-06-24

merged with staging

1350. By Nick Dedekind on 2016-06-21

merged exclusiveGroup