Merge lp:~robertcarr/mir/remove-mir-disable-input into lp:~mir-team/mir/trunk
Proposed by
Robert Carr
Status: | Merged |
---|---|
Approved by: | Robert Carr |
Approved revision: | no longer in the source branch. |
Merged at revision: | 559 |
Proposed branch: | lp:~robertcarr/mir/remove-mir-disable-input |
Merge into: | lp:~mir-team/mir/trunk |
Diff against target: |
333 lines (+69/-91) 13 files modified
3rd_party/CMakeLists.txt (+2/-6) CMakeLists.txt (+0/-7) cross-compile-chroot.sh (+0/-1) debian/rules (+0/-1) doc/building_source_for_android.md (+2/-2) examples/render_surfaces.cpp (+2/-16) include/server/mir/input/null_input_manager.h (+56/-0) src/server/default_server_configuration.cpp (+7/-2) src/server/input/CMakeLists.txt (+0/-7) src/server/input/dummy_input_manager.cpp (+0/-42) tests/integration-tests/CMakeLists.txt (+0/-2) tests/mir_test_doubles/CMakeLists.txt (+0/-2) tests/unit-tests/CMakeLists.txt (+0/-3) |
To merge this branch: | bzr merge lp:~robertcarr/mir/remove-mir-disable-input |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alan Griffiths | Approve | ||
Daniel van Vugt | Needs Resubmitting | ||
Kevin DuBois (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+156696@code.launchpad.net |
Commit message
Remove MIR_DISABLE_INPUT build option and replace with a runtime option.
Description of the change
Remove MIR_DISABLE_INPUT build option and replace with a runtime option.
To post a comment you must log in.
PASSED: Continuous integration, rev:558 jenkins. qa.ubuntu. com/job/ mir-ci/ 294/ jenkins. qa.ubuntu. com/job/ mir-android- raring- i386-build/ 251 jenkins. qa.ubuntu. com/job/ mir-clang- raring- amd64-build/ 134 jenkins. qa.ubuntu. com/job/ mir-quantal- amd64-ci/ 299 jenkins. qa.ubuntu. com/job/ mir-quantal- amd64-ci/ 299/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-vm- ci-build/ ./distribution= precise, flavor= amd64/106
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ mir-ci/ 294/rebuild
http://