Merge lp://staging/~alan-griffiths/qtmir/migrate-to-mir-Server-API into lp://staging/qtmir

Proposed by Alan Griffiths
Status: Work in progress
Proposed branch: lp://staging/~alan-griffiths/qtmir/migrate-to-mir-Server-API
Merge into: lp://staging/qtmir
Diff against target: 1018 lines (+172/-222)
21 files modified
src/modules/Unity/Application/application_manager.cpp (+8/-8)
src/modules/Unity/Application/application_manager.h (+3/-3)
src/modules/Unity/Application/mirsurfacemanager.cpp (+4/-4)
src/modules/Unity/Application/mirsurfacemanager.h (+3/-3)
src/modules/Unity/Application/sessionmanager.cpp (+6/-6)
src/modules/Unity/Application/sessionmanager.h (+3/-3)
src/platforms/mirserver/display.cpp (+5/-4)
src/platforms/mirserver/display.h (+3/-4)
src/platforms/mirserver/miropenglcontext.cpp (+6/-6)
src/platforms/mirserver/miropenglcontext.h (+3/-3)
src/platforms/mirserver/mirserver.cpp (+53/-102)
src/platforms/mirserver/mirserver.h (+21/-17)
src/platforms/mirserver/mirserver.pro (+2/-2)
src/platforms/mirserver/mirserverintegration.cpp (+14/-19)
src/platforms/mirserver/mirserverintegration.h (+3/-3)
src/platforms/mirserver/nativeinterface.cpp (+6/-6)
src/platforms/mirserver/nativeinterface.h (+3/-3)
src/platforms/mirserver/qmirserver.cpp (+1/-1)
src/platforms/mirserver/qmirserver.h (+10/-10)
tests/modules/common/qtmir_test.h (+11/-15)
tests/tests.pro (+4/-0)
To merge this branch: bzr merge lp://staging/~alan-griffiths/qtmir/migrate-to-mir-Server-API
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Review via email: mp+240451@code.staging.launchpad.net

Commit message

Migration of qtmir from the legacy Mir API

Description of the change

Migration of qtmir from the legacy Mir API

To post a comment you must log in.
284. By Alan Griffiths

Ensure MirServer is initialized by calling apply_settings() in ctor

285. By Alan Griffiths

Fix outdated names

Revision history for this message
Gerry Boland (gerboland) wrote :

LGTM

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Y

review: Approve
Revision history for this message
Gerry Boland (gerboland) wrote :

Oops, sorry, wrong MR window!

286. By Alan Griffiths

merge lp:qtmir

Unmerged revisions

286. By Alan Griffiths

merge lp:qtmir

285. By Alan Griffiths

Fix outdated names

284. By Alan Griffiths

Ensure MirServer is initialized by calling apply_settings() in ctor

283. By Alan Griffiths

Rename MirServerConfiguration => MirServer

282. By Alan Griffiths

Clean up after spike

281. By Alan Griffiths

Fix up the tests

280. By Alan Griffiths

Remove mentions of mir::DefaultServerConfiguration

279. By Alan Griffiths

Quick spike to test API

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches