Merge lp://staging/~nick-dedekind/qmenumodel/remove.unitymenuaction into lp://staging/~phablet-team/qmenumodel/trunk
Proposed by
Nick Dedekind
Status: | Merged |
---|---|
Approved by: | Lars Karlitski |
Approved revision: | 71 |
Merged at revision: | 72 |
Proposed branch: | lp://staging/~nick-dedekind/qmenumodel/remove.unitymenuaction |
Merge into: | lp://staging/~phablet-team/qmenumodel/trunk |
Diff against target: |
337 lines (+35/-196) 6 files modified
libqmenumodel/QMenuModel/plugin.cpp (+0/-3) libqmenumodel/src/CMakeLists.txt (+0/-2) libqmenumodel/src/unitymenuaction.cpp (+0/-60) libqmenumodel/src/unitymenuaction.h (+0/-66) libqmenumodel/src/unitymenumodel.cpp (+32/-64) libqmenumodel/src/unitymenumodel.h (+3/-1) |
To merge this branch: | bzr merge lp://staging/~nick-dedekind/qmenumodel/remove.unitymenuaction |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Lars Karlitski (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+179800@code.staging.launchpad.net |
Commit message
Removed UnityMenuAction
Description of the change
Removed UnityMenuAction.
Was causing memory leaks from UnityMenuModel.
Replaced with roles for action name & action state.
To post a comment you must log in.
PASSED: Continuous integration, rev:71 jenkins. qa.ubuntu. com/job/ qmenumodel- ci/21/ jenkins. qa.ubuntu. com/job/ qmenumodel- saucy-amd64- ci/18 jenkins. qa.ubuntu. com/job/ qmenumodel- saucy-armhf- ci/18
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ qmenumodel- ci/21/rebuild
http://