Merge lp://staging/~dandrader/qtmir/miral-qt-integration into lp://staging/~unity-team/qtmir/miral-qt-integration
Proposed by
Daniel d'Andrada
| Status: | Merged |
|---|---|
| Approved by: | Gerry Boland |
| Approved revision: | 589 |
| Merged at revision: | 589 |
| Proposed branch: | lp://staging/~dandrader/qtmir/miral-qt-integration |
| Merge into: | lp://staging/~unity-team/qtmir/miral-qt-integration |
| Diff against target: |
230 lines (+43/-41) 11 files modified
CMakeLists.txt (+2/-2) debian/changelog (+6/-0) debian/control (+5/-5) src/platforms/mirserver/miropenglcontext.cpp (+3/-12) src/platforms/mirserver/mirserverstatuslistener.cpp (+8/-0) src/platforms/mirserver/mirserverstatuslistener.h (+2/-5) tests/framework/fake_displayconfigurationoutput.h (+3/-10) tests/framework/fake_surface.h (+6/-3) tests/framework/mock_mir_session.cpp (+2/-0) tests/framework/mock_mir_session.h (+3/-0) tests/framework/mock_surface.h (+3/-4) |
| To merge this branch: | bzr merge lp://staging/~dandrader/qtmir/miral-qt-integration |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Gerry Boland (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Mir 0.25 compat (merging upcoming trunk)
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/control'
can you bump the deps for mir-renderer-gl-dev & mirtest-dev please, just in case.