Merge lp:~alan-griffiths/qtmir/spike-using-WindowManager into lp:qtmir/devel-mir-next
Status: | Work in progress |
---|---|
Proposed branch: | lp:~alan-griffiths/qtmir/spike-using-WindowManager |
Merge into: | lp:qtmir/devel-mir-next |
Prerequisite: | lp:~mir-team/qtmir/devel-mir-next-update |
Diff against target: |
777 lines (+201/-238) 14 files modified
src/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) |
To merge this branch: | bzr merge lp:~alan-griffiths/qtmir/spike-using-WindowManager |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mir development team | 2015-04-01 | Pending | |
PS Jenkins bot | continuous-integration | 2015-04-01 | Pending |
Review via email:
|
This proposal supersedes a proposal from 2015-03-26.
Commit message
Switch from subclassing mir::shell:
Description of the change
Switch from subclassing mir::shell:
- 278. By Daniel van Vugt on 2015-04-02
- 279. By Alan Griffiths on 2015-05-01
-
Mir 0.13.0 fixes
- 280. By Alan Griffiths on 2015-05-01
-
Workaround API that uses references to opaque types
- 281. By Alan Griffiths on 2015-05-01
-
libmircommon-dev dependency should be versioned
- 282. By Alan Griffiths on 2015-05-06
- 283. By Alan Griffiths on 2015-05-06
-
Very basic version of MirWindowManage
r::modify_ surface( )
Alan Griffiths (alan-griffiths) wrote : | # |
* Did you perform an exploratory manual test run of the code change and any related functionality?
Works on manta with Mir 0.13.0 stack
* Did CI run pass?
Not until 0.13.0 is in archive
Unmerged revisions
- 283. By Alan Griffiths on 2015-05-06
-
Very basic version of MirWindowManage
r::modify_ surface( ) - 282. By Alan Griffiths on 2015-05-06
- 281. By Alan Griffiths on 2015-05-01
-
libmircommon-dev dependency should be versioned
- 280. By Alan Griffiths on 2015-05-01
-
Workaround API that uses references to opaque types
- 279. By Alan Griffiths on 2015-05-01
-
Mir 0.13.0 fixes
- 278. By Daniel van Vugt on 2015-04-02
- 277. By Daniel van Vugt on 2015-03-27
-
Update mock headers so they can build again, following racarr's
cursor BufferStream changes. - 276. By Daniel van Vugt on 2015-03-27
-
Migrate to MirEvent 2.1 API, coming in Mir 0.13
- 275. By Daniel van Vugt on 2015-03-25
-
Link to libmirclient too. That's where all mir_* client (and input
functions) now correctly reside. - 274. By Daniel van Vugt on 2015-03-25
-
Merge branch lp:~mir-team/qtmir/compatibility-with-mir-API-changes
FAILED: Continuous integration, rev:340 jenkins. qa.ubuntu. com/job/ qtmir-ci/ 244/ jenkins. qa.ubuntu. com/job/ qtmir-vivid- amd64-ci/ 95/console jenkins. qa.ubuntu. com/job/ qtmir-vivid- armhf-ci/ 95/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/qtmir- ci/244/ rebuild
http://