lp:~nick-dedekind/unity8/indicator.submenu-reinit

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:unity8 at revision 513

PS Jenkins bot (community): Approve (continuous-integration) on 2013-11-07

Albert Astals Cid (community): Approve on 2013-10-21

Diff: 1145 lines (+884/-71)

16 files modified

plugins/Unity/Indicators/unitymenumodelstack.cpp (+101/-10)
plugins/Unity/Indicators/unitymenumodelstack.h (+10/-2)
tests/mocks/QMenuModel/CMakeLists.txt (+23/-0)
tests/mocks/QMenuModel/UnityMenuAction.qml (+30/-0)
tests/mocks/QMenuModel/UnityMenuModel.qml (+0/-26)
tests/mocks/QMenuModel/actionstateparser.cpp (+19/-0)
tests/mocks/QMenuModel/actionstateparser.h (+35/-0)
tests/mocks/QMenuModel/plugin.cpp (+30/-0)
tests/mocks/QMenuModel/plugin.h (+34/-0)
tests/mocks/QMenuModel/qmldir (+3/-1)
tests/mocks/QMenuModel/unitymenumodel.cpp (+239/-0)
tests/mocks/QMenuModel/unitymenumodel.h (+96/-0)
tests/plugins/Unity/Indicators/CMakeLists.txt (+39/-30)
tests/plugins/Unity/Indicators/unitymenumodelstacktest.cpp (+206/-0)
tests/qmltests/CMakeLists.txt (+3/-2)
tests/qmltests/Greeter/tst_Clock.qml (+16/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

261. By Nick Dedekind on 2013-11-06

Fixed clock test imports

260. By Nick Dedekind on 2013-11-06

Merged with trunk

259. By Nick Dedekind on 2013-10-17

Removed clock tests from build tests

258. By Nick Dedekind on 2013-10-16

merged with trunk

257. By Nick Dedekind on 2013-10-14

Added copywrite

256. By Nick Dedekind on 2013-10-14

fix tests

255. By Nick Dedekind on 2013-10-14

merged with trunk

254. By Nick Dedekind on 2013-10-11

Fixed QMenuModel mocking

253. By Nick Dedekind on 2013-10-11

merged with trunk

252. By Nick Dedekind on 2013-10-11

merged with trunk