lp://staging/~unity-team/qtmir/multimonitorNext

Branch merges

Propose for merging

No branches dependent on this one.

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

Michał Sawicz: Approve on 2015-10-15

Gerry Boland: Pending requested 2015-10-15

PS Jenkins bot: Pending (continuous-integration) requested 2015-10-15

Diff: 345 lines (+77/-84)

11 files modified

src/common/debughelpers.cpp (+30/-1)
src/common/debughelpers.h (+1/-0)
src/platforms/mirserver/mirserver.cpp (+7/-1)
src/platforms/mirserver/mirserverintegration.cpp (+3/-11)
src/platforms/mirserver/qtcompositor.cpp (+13/-0)
src/platforms/mirserver/qtcompositor.h (+12/-0)
src/platforms/mirserver/qteventfeeder.cpp (+6/-2)
src/platforms/mirserver/screencontroller.cpp (+5/-52)
src/platforms/mirserver/screencontroller.h (+0/-1)
src/platforms/mirserver/screenwindow.cpp (+0/-4)
tests/mirserver/ScreenController/screencontroller_test.cpp (+0/-12)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

390. By Michał Sawicz on 2015-10-15

Merge lp:~unity-team/qtmir/surviveEmptyTexture

389. By Daniel d'Andrada on 2015-10-14

Merge lp:~dandrader/qtmir/surviveEmptyTexture again

388. By Daniel d'Andrada on 2015-10-05

work around https://bugs.launchpad.net/mir/+bug/1502200

387. By Daniel d'Andrada on 2015-10-02

Improve multimonitor support

* Removed magic:
 - Don't automagically select the screen where a window will be show.
   Let shell decide.
 - Don't automagically focus a window. Let shell handle it.

* Let shell know when a screen is about to be removed so that it has
  the opportunity to move or destroy a window in it before it's too late.
  - Added QGuiApplication::onScreenAboutToBeRemoved

* Added logging to key events

386. By Daniel d'Andrada on 2015-10-02

Merge lp:~dandrader/qtmir/surviveEmptyTexture

385. By Daniel d'Andrada on 2015-10-02

lp:~gerboland/qtmir/multimonitor

384. By CI Train Bot Account on 2015-09-30

Releasing 0.4.6+15.10.20150930.1-0ubuntu1

383. By Gerry Boland on 2015-09-30

Add "Closing" state to Application, use it to distinguish user-induced close from app-induced close. Don't clear QML cache if user-induced.

Much code taken from a partially-related branch by Nick Dedekind:
https://code.launchpad.net/~nick-dedekind/qtmir/polite-close/+merge/262188

Note there is 1 disabled test, which needs additional work to fix. Fixes: #1500372
Approved by: PS Jenkins bot

382. By Daniel d'Andrada on 2015-09-30

MirSurfaceItem: texture must be manipulated only from the scene graph thread

Do not delete the texture from within the GUI thread ever, even if the
MirSurfaceItem is no longer holding the MirSurface that provided it.
Otherwise you run the risk of having the scene graph thread dereferencing
a pointer to a texture that no longer exists.

This also fixes fd leak LP: #1495871 (which was a texture/buffer leak). Fixes: #1495871, #1499388
Approved by: Gerry Boland, PS Jenkins bot

381. By CI Train Bot Account on 2015-09-25

Releasing 0.4.6+15.10.20150925-0ubuntu1