Merge lp://qastaging/~alan-griffiths/mir/fix-bug-1137170 into lp://qastaging/~mir-team/mir/trunk
Proposed by
Alan Griffiths
| Status: | Merged |
|---|---|
| Approved by: | Alexandros Frantzis |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 551 |
| Proposed branch: | lp://qastaging/~alan-griffiths/mir/fix-bug-1137170 |
| Merge into: | lp://qastaging/~mir-team/mir/trunk |
| Diff against target: |
1313 lines (+170/-164) 35 files modified
include/client/mir_toolkit/mir_client_library.h (+4/-5) include/client/mir_toolkit/mir_client_library_drm.h (+5/-2) include/client/mir_toolkit/mir_client_library_lightdm.h (+5/-2) include/shared/mir_toolkit/c_types.h (+5/-2) include/shared/mir_toolkit/common.h (+6/-1) include/shared/mir_toolkit/input/event.h (+5/-0) include/shared/mir_toolkit/mesa/native_display.h (+5/-3) src/client/android/android_client_buffer_factory.cpp (+1/-1) src/client/android/android_client_buffer_factory.h (+1/-1) src/client/android/android_native_display_container.cpp (+6/-6) src/client/android/android_native_display_container.h (+3/-3) src/client/client_buffer.h (+6/-4) src/client/client_buffer_depository.cpp (+1/-1) src/client/client_buffer_depository.h (+1/-6) src/client/client_buffer_factory.h (+1/-1) src/client/client_context.h (+2/-8) src/client/egl_native_display_container.h (+3/-3) src/client/gbm/gbm_client_buffer.cpp (+2/-2) src/client/gbm/gbm_client_buffer.h (+3/-3) src/client/gbm/gbm_client_buffer_factory.cpp (+1/-1) src/client/gbm/gbm_client_buffer_factory.h (+1/-1) src/client/gbm/gbm_client_platform.cpp (+1/-1) src/client/gbm/mesa_native_display_container.cpp (+9/-9) src/client/gbm/mesa_native_display_container.h (+4/-4) src/client/mir_client_library.cpp (+31/-31) src/client/mir_client_surface.h (+2/-2) src/client/mir_connection.cpp (+23/-23) src/client/mir_connection.h (+1/-1) src/client/mir_surface.cpp (+19/-19) src/client/mir_surface.h (+1/-1) src/client/mir_wait_handle.cpp (+5/-5) src/client/mir_wait_handle.h (+5/-3) tests/unit-tests/client/gbm/test_mesa_native_display_container.cpp (+1/-1) tests/unit-tests/client/test_aging_buffer.cpp (+1/-6) tests/unit-tests/client/test_wait_handle.cpp (+0/-2) |
| To merge this branch: | bzr merge lp://qastaging/~alan-griffiths/mir/fix-bug-1137170 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Daniel van Vugt | Needs Fixing | ||
| Kevin DuBois (community) | Approve | ||
| Alexandros Frantzis (community) | Approve | ||
|
Review via email:
|
|||
Commit message
mir_toolkit: replace mir_toolkit namespace with a Doxygen group
Description of the change
mir_toolkit: replace mir_toolkit namespace with a Doxygen group
While this removes references to the namespace from the "toolkit" API it also dumps a load of types into global namespace. This causes some clutter on build/doc/
I don't think this is ideal, but is probably a net improvement.
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
| Alan Griffiths (alan-griffiths) wrote | # |
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Kevin DuBois (kdub) wrote | # |
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(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:547
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://