qmenumodel

Merge lp://staging/~nick-dedekind/qmenumodel/desktop_menus into lp://staging/qmenumodel

  1. desktop_menus
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Merged
Approved by: Lukáš Tinkl
Approved revision: 124
Merged at revision: 127
Proposed branch: lp://staging/~nick-dedekind/qmenumodel/desktop_menus
Merge into: lp://staging/qmenumodel
Diff against target: 140 lines (+37/-5)
5 files modified
debian/changelog (+8/-0)
libqmenumodel/src/qdbusactiongroup.cpp (+13/-0)
libqmenumodel/src/qdbusactiongroup.h (+3/-0)
libqmenumodel/src/unitymenuaction.cpp (+0/-2)
libqmenumodel/src/unitymenumodel.cpp (+13/-3)
To merge this branch: bzr merge lp://staging/~nick-dedekind/qmenumodel/desktop_menus
Reviewer Review Type Date Requested Status
Lukáš Tinkl (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Indicator Applet Developers Pending
Review via email: mp+282731@code.staging.launchpad.net

Commit message

Added roles for submenu & shortcut. Added actions property to Group

Description of the change

Added roles for submenu & shortcut. Added actions property to Group

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:119
http://jenkins.qa.ubuntu.com/job/qmenumodel-ci/60/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-wily-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-wily-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/qmenumodel-wily-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qmenumodel-ci/60/rebuild

review: Approve (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

Just one minor inline nit, otherwise the code looks good

review: Needs Information
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

INline comment as well...

lp://staging/~nick-dedekind/qmenumodel/desktop_menus updated
120. By Nick Dedekind

better boolean check

Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

> INline comment as well...

Done.

lp://staging/~nick-dedekind/qmenumodel/desktop_menus updated
121. By Nick Dedekind

version bump

Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

Text conflict in debian/changelog

review: Needs Fixing
lp://staging/~nick-dedekind/qmenumodel/desktop_menus updated
122. By Nick Dedekind

merged with trunk

Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

> Text conflict in debian/changelog

Merged.

lp://staging/~nick-dedekind/qmenumodel/desktop_menus updated
123. By Nick Dedekind

fixed version file

124. By Nick Dedekind

added to changelog

Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

LGTM, works fine with the app menus silo

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches