Merge lp://staging/~nick-dedekind/qmenumodel/QTBUG-32859 into lp://staging/~phablet-team/qmenumodel/trunk
Proposed by
Nick Dedekind
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Lars Karlitski | ||||||||
| Approved revision: | 72 | ||||||||
| Merged at revision: | 77 | ||||||||
| Proposed branch: | lp://staging/~nick-dedekind/qmenumodel/QTBUG-32859 | ||||||||
| Merge into: | lp://staging/~phablet-team/qmenumodel/trunk | ||||||||
| Diff against target: |
621 lines (+335/-54) 12 files modified
libqmenumodel/src/CMakeLists.txt (+1/-0) libqmenumodel/src/menunode.cpp (+5/-10) libqmenumodel/src/qdbusactiongroup.cpp (+37/-5) libqmenumodel/src/qdbusactiongroup.h (+3/-1) libqmenumodel/src/qdbusmenumodel.cpp (+22/-5) libqmenumodel/src/qdbusmenumodel.h (+2/-0) libqmenumodel/src/qdbusobject.cpp (+31/-8) libqmenumodel/src/qdbusobject.h (+5/-1) libqmenumodel/src/qmenumodel.cpp (+32/-21) libqmenumodel/src/qmenumodel.h (+2/-3) libqmenumodel/src/qmenumodelevents.cpp (+96/-0) libqmenumodel/src/qmenumodelevents.h (+99/-0) |
||||||||
| To merge this branch: | bzr merge lp://staging/~nick-dedekind/qmenumodel/QTBUG-32859 | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Lars Karlitski (community) | Approve | ||
| PS Jenkins bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Adds qt event spawning to direct glib main loop callbacks.
Description of the change
Adds qt event spawning to direct glib main loop callbacks.
Fixes bug https:/
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:71
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://