lp:~alan-griffiths/qtmir/spike-using-WindowManager
Created by
Alan Griffiths
and last modified
- Get this branch:
- bzr branch lp:~alan-griffiths/qtmir/spike-using-WindowManager
Only
Alan Griffiths
can upload to this branch. If you are
Alan Griffiths
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
On hold
for merging
into
lp:qtmir/devel-mir-next
- PS Jenkins bot: Pending (continuous-integration) requested
- Mir development team: Pending requested
-
Diff: 777 lines (+201/-238)14 files modifiedsrc/modules/Unity/Application/application_manager.h (+1/-1)
src/modules/Unity/Application/mirsurfaceitem.cpp (+2/-2)
src/modules/Unity/Application/mirsurfaceitem.h (+4/-3)
src/modules/Unity/Application/mirsurfacemanager.cpp (+8/-9)
src/modules/Unity/Application/mirsurfacemanager.h (+5/-5)
src/modules/Unity/Application/sessionmanager.cpp (+0/-1)
src/platforms/mirserver/CMakeLists.txt (+1/-1)
src/platforms/mirserver/mirserver.cpp (+32/-50)
src/platforms/mirserver/mirserver.h (+8/-7)
src/platforms/mirserver/mirwindowmanager.cpp (+98/-140)
src/platforms/mirserver/mirwindowmanager.h (+33/-14)
src/platforms/mirserver/nativeinterface.cpp (+7/-2)
src/platforms/mirserver/nativeinterface.h (+1/-1)
tests/modules/common/qtmir_test.h (+1/-2)
Superseded
for merging
into
lp:qtmir
- PS Jenkins bot (community): Needs Fixing (continuous-integration)
- Mir development team: Pending requested
-
Diff: 1248 lines (+288/-271)23 files modifiedsrc/common/debughelpers.cpp (+4/-4)
src/modules/Unity/Application/application_manager.cpp (+2/-2)
src/modules/Unity/Application/application_manager.h (+1/-1)
src/modules/Unity/Application/mirsurfaceitem.cpp (+25/-25)
src/modules/Unity/Application/mirsurfaceitem.h (+4/-3)
src/modules/Unity/Application/mirsurfacemanager.cpp (+8/-9)
src/modules/Unity/Application/mirsurfacemanager.h (+5/-5)
src/modules/Unity/Application/sessionmanager.cpp (+0/-1)
src/platforms/mirserver/CMakeLists.txt (+1/-1)
src/platforms/mirserver/mirserver.cpp (+32/-50)
src/platforms/mirserver/mirserver.h (+8/-7)
src/platforms/mirserver/mirserverintegration.cpp (+8/-4)
src/platforms/mirserver/mirwindowmanager.cpp (+69/-36)
src/platforms/mirserver/mirwindowmanager.h (+31/-14)
src/platforms/mirserver/nativeinterface.cpp (+7/-2)
src/platforms/mirserver/nativeinterface.h (+1/-1)
src/platforms/mirserver/qteventfeeder.cpp (+33/-33)
src/platforms/mirserver/surfaceobserver.h (+2/-1)
tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp (+20/-52)
tests/modules/MirSurfaceItem/mirsurfaceitem_test.cpp (+17/-17)
tests/modules/common/mock_mir_session.h (+4/-0)
tests/modules/common/mock_surface.h (+5/-1)
tests/modules/common/qtmir_test.h (+1/-2)
Branch information
Recent revisions
- 277. By Daniel van Vugt
-
Update mock headers so they can build again, following racarr's
cursor BufferStream changes. - 275. By Daniel van Vugt
-
Link to libmirclient too. That's where all mir_* client (and input
functions) now correctly reside.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:qtmir