Merge lp://qastaging/~alan-griffiths/mir/spike-nested-input into lp://qastaging/~mir-team/mir/trunk
Proposed by
Alan Griffiths
Status: | Merged |
---|---|
Approved by: | Alan Griffiths |
Approved revision: | no longer in the source branch. |
Merged at revision: | 1059 |
Proposed branch: | lp://qastaging/~alan-griffiths/mir/spike-nested-input |
Merge into: | lp://qastaging/~mir-team/mir/trunk |
Prerequisite: | lp://qastaging/~alan-griffiths/mir/spike-more-nested-input |
Diff against target: |
612 lines (+285/-59) 13 files modified
include/server/mir/default_server_configuration.h (+3/-0) include/server/mir/graphics/nested/nested_platform.h (+7/-3) include/server/mir/input/nested_input_configuration.h (+5/-18) include/server/mir/input/nested_input_relay.h (+49/-0) src/server/default_server_configuration.cpp (+13/-2) src/server/graphics/nested/nested_display.cpp (+10/-2) src/server/graphics/nested/nested_display.h (+3/-0) src/server/graphics/nested/nested_output.cpp (+38/-1) src/server/graphics/nested/nested_output.h (+7/-3) src/server/graphics/nested/nested_platform.cpp (+3/-1) src/server/input/CMakeLists.txt (+1/-0) src/server/input/nested_input_configuration.cpp (+4/-29) src/server/input/nested_input_relay.cpp (+142/-0) |
To merge this branch: | bzr merge lp://qastaging/~alan-griffiths/mir/spike-nested-input |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Alexandros Frantzis (community) | Approve | ||
Kevin DuBois (community) | Approve | ||
Review via email:
|
Commit message
graphics: Hook up nested surfaces events to input
Description of the change
graphics: Hook up nested surfaces events to input
To post a comment you must log in.
FAILED: Continuous integration, rev:1057 jenkins. qa.ubuntu. com/job/ mir-ci/ 1445/ jenkins. qa.ubuntu. com/job/ mir-android- saucy-i386- build/1950 jenkins. qa.ubuntu. com/job/ mir-clang- saucy-amd64- build/1835 jenkins. qa.ubuntu. com/job/ mir-saucy- amd64-ci/ 683/console
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ mir-ci/ 1445/rebuild
http://