lp://staging/qtmir/devel-mir-next

Branch merges

Propose for merging

1 branch proposed for merging into this one.

No branches dependent on this one.

Merged into lp://staging/qtmir at revision 429

Michał Sawicz: Approve on 2015-12-14

Gerry Boland (community): Approve on 2015-12-14

PS Jenkins bot (community): Needs Fixing (continuous-integration) on 2015-12-14

Diff: 1865 lines (+736/-139)

36 files modified

CMakeLists.txt (+1/-1)
debian/changelog (+21/-0)
debian/control (+5/-5)
src/modules/Unity/Application/application.cpp (+79/-11)
src/modules/Unity/Application/application.h (+11/-0)
src/modules/Unity/Application/application_manager.cpp (+54/-12)
src/modules/Unity/Application/application_manager.h (+4/-1)
src/modules/Unity/Application/mirsurface.cpp (+23/-20)
src/modules/Unity/Application/mirsurface.h (+2/-0)
src/modules/Unity/Application/mirsurfaceinterface.h (+2/-0)
src/modules/Unity/Application/mirsurfaceitem.cpp (+35/-6)
src/modules/Unity/Application/mirsurfaceitem.h (+5/-0)
src/modules/Unity/Application/mirsurfacemanager.cpp (+1/-1)
src/modules/Unity/Application/session.cpp (+115/-56)
src/modules/Unity/Application/session.h (+9/-4)
src/modules/Unity/Application/session_interface.h (+17/-4)
src/platforms/mirserver/mirwindowmanager.cpp (+12/-0)
src/platforms/mirserver/sessionauthorizer.cpp (+10/-0)
src/platforms/mirserver/sessionauthorizer.h (+1/-0)
src/platforms/mirserver/surfaceobserver.cpp (+6/-1)
src/platforms/mirserver/surfaceobserver.h (+2/-1)
tests/common/mock_display_configuration.h (+1/-0)
tests/mirserver/ScreenController/stub_display.h (+6/-0)
tests/mirserver/WindowManager/stub_session.cpp (+4/-0)
tests/mirserver/WindowManager/stub_session.h (+1/-1)
tests/mirserver/WindowManager/window_manager.cpp (+1/-1)
tests/modules/Application/CMakeLists.txt (+5/-0)
tests/modules/ApplicationManager/application_manager_test.cpp (+264/-1)
tests/modules/SessionManager/session_test.cpp (+3/-3)
tests/modules/SurfaceManager/mirsurface_test.cpp (+1/-1)
tests/modules/common/fake_mirsurface.h (+7/-0)
tests/modules/common/fake_session.h (+8/-2)
tests/modules/common/mock_mir_session.h (+1/-0)
tests/modules/common/mock_session.h (+9/-6)
tests/modules/common/qtmir_test.cpp (+3/-0)
tests/modules/common/qtmir_test.h (+7/-1)

api

Related source package recipes

2 recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

643. By Alan Griffiths on 2017-10-13

Mir 1.0 => Mir 0.28

642. By Alan Griffiths on 2017-10-09

Frig for LP build recipe

641. By Alan Griffiths on 2017-09-28

1.0 compat

640. By Alan Griffiths on 2017-09-28

0.27 compat

639. By CI Train Bot Account on 2017-04-04

Releasing 0.5.1+17.04.20170404-0ubuntu1

638. By Daniel d'Andrada on 2017-04-04

Support multiple sessions per Application (LP: #1675448)

Approved by: Gerry Boland, Unity8 CI Bot

637. By Albert Astals Cid on 2017-04-04

EventInfo::store: Store an empty cookie for mir events without cookie

Otherwise when the m_eventInfoVector ringbuffer wraps we end up returning a stale cookie for events that had no cookie (e.g. mouse move events)

Approved by: Andreas Pokorny, Gerry Boland

636. By Albert Astals Cid on 2017-04-04

Remove m_tools member

CanonicalWindowManagerPolicy already has a tools, no need to have our own

Approved by: Gerry Boland, Unity8 CI Bot

635. By CI Train Bot Account on 2017-03-28

Releasing 0.5.1+17.04.20170328-0ubuntu1

634. By Alan Griffiths on 2017-03-28

Compatibility with lp:mir and lp:~alan-griffiths/miral/1.3

Approved by: Gerry Boland, Unity8 CI Bot