Merge lp:~aacid/qtmir/clazy_run into lp:qtmir

[Albert Astals Cid]

Improvements from running clazy over the code

* Use QStringLiterals for literals
* Add some QLatin1Strings
* Add some reserve() calls
* Change a QList to QVector since QList is not optimal on big items
* Add some const &
* Add one override
* Fix some struct/class mistmatches

clazy: https://quickgit.kde.org/?p=scratch%2Fsmartins%2Fclazy.git
Run over the src folder

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:370
http://jenkins.qa.ubuntu.com/job/qtmir-ci/404/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/137/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/137/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/404/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:370
http://jenkins.qa.ubuntu.com/job/qtmir-ci/406/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/139/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/139/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/406/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Was this all done by the script? We've a couple of big things to land, and this will conflict with them all. Would prefer to do this when things more quiet.

[Albert Astals Cid (aacid)]

This is manual (acting on the tool warnings):
 * Add some reserve() calls
 * Change a QList to QVector since QList is not optimal on big items
 * Add some const &
 * Add one override
 * Fix some struct/class mistmatches

This is automatic:
 * Use QStringLiterals for literals
 * Add some QLatin1Strings

We're working on some improvements on the tool so that QLatin1String is used in places it is better than QStringLiteral so may make sense wait for that to land.

[lp:~aacid/qtmir/clazy_run]

372. By Daniel van Vugt on 2015-09-14

Stop waking up every 200ms if there's nothing to wake up for.
It's just wasting battery.

This solves at least half of LP: #1479250. Although the regular
wakeup problem is solved by this, Unity8 continues to use noticeable
CPU while idle (obviously in much less frequent intervals now). Fixes: #1479250
Approved by: Gerry Boland

373. By Daniel d'Andrada on 2015-09-14

MirSurfaceItem gets dirty when it's set to draw a different (or no) surface Fixes: #1492185
Approved by: Gerry Boland

374. By Daniel d'Andrada on 2015-09-14

QtEventFeeder: log the pointer events it gets from Mir
Approved by: PS Jenkins bot, Gerry Boland

375. By CI Train Bot Account on 2015-09-14

Releasing 0.4.6+15.10.20150914-0ubuntu1

376. By Daniel d'Andrada on 2015-09-18

Update surface focus when a surface enters or leaves a MirSurfaceItem

+ Refactor MirSurfaceItem so that it talks to a MirSurfaceInterface
  instead of the concrete MirSurface class
+ Make MirSurface::setFocus() more robust Fixes: #1491034, #1495437
Approved by: PS Jenkins bot, Gerry Boland

377. By CI Train Bot Account on 2015-09-18

Releasing 0.4.6+15.10.20150918-0ubuntu1

378. By Cemil Azizoglu on 2015-09-23

Port gl_bind_to_texture to the new TextureSource interface.
Update for Mir 0.16 release.
Approved by: Alan Griffiths

379. By CI Train Bot Account on 2015-09-23

Releasing 0.4.6+15.10.20150923-0ubuntu1

380. By Michał Sawicz on 2015-09-25

Bump application API version
Approved by: Daniel d'Andrada

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

Releasing 0.4.6+15.10.20150925-0ubuntu1

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:372
http://jenkins.qa.ubuntu.com/job/qtmir-ci/447/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/143/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/143/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/180/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/180/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/25/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/447/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:373
http://jenkins.qa.ubuntu.com/job/qtmir-ci/451/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/147
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/147/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/184
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/184
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/184/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/29

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/451/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:374
http://jenkins.qa.ubuntu.com/job/qtmir-ci/454/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/150
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/150/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/187
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/187/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/32

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/454/rebuild

review: Approve (continuous-integration)

[lp:~aacid/qtmir/clazy_run]

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

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

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

Releasing 0.4.6+15.10.20150930.1-0ubuntu1

385. By Alexandros Frantzis on 2015-10-08

Update for Mir 0.17 changes

386. By CI Train Bot Account on 2015-10-08

Releasing 0.4.6+15.10.20151008.2-0ubuntu1

387. By Albert Astals Cid on 2015-10-21

Don't search for the element again

Approved by: Gerry Boland, PS Jenkins bot

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

Shell draws its own cursor using the new Cursor QML element
Approved by: Lukáš Tinkl, Gerry Boland

389. By Gerry Boland on 2015-10-21

Initial multimonitor support - react correctly to Mir DisplayConfiguration changes.

On Mir DisplayConfiguration changes, QtMir now correctly:
1. blocks Mir until it has stopped all renderers and has their GL contexts released
2. reads the new DisplayConfiguration, matches any existing ScreenWindows to new DisplayBuffers should they change (as Mir may destroy and create it on us)
3. restarts all renderers

This also solves shutdown crash issues due to raciness of mir destroying the GL context backing the shell's QWindow before its renderer had stopped.

Add Unity.Screens qml module to advertise current screen state to QML. Fixes: #1436735, #1488831, #1488863
Approved by: Daniel d'Andrada

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

MirSurfaceItem: Survive holding a surface with an empty texture

Survive having a surface whose texture holds no mir buffer at all.
Instead of crashing in such situation we simply don't render it.
Approved by: Gerry Boland

391. By Michał Sawicz on 2015-10-21

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
Approved by: Michał Sawicz

392. By Alan Griffiths on 2015-10-21

Opaquify MirWindowManager to control visibility of upcoming Window Management work
Approved by: Gerry Boland, PS Jenkins bot

393. By Lukáš Tinkl on 2015-10-21

React to surface modifications (window caption)
Approved by: Daniel d'Andrada

394. By Nick Dedekind on 2015-10-21

Removed the manipulation of the CMAKE_INSTALL_PREFIX from debian/rules
Approved by: Gerry Boland

395. By Nick Dedekind on 2015-10-21

Added touch performance tracing and test.
Approved by: Gerry Boland

396. By Lukáš Tinkl on 2015-10-21

Implement support for mouse wheel events; correctly pass around buttons Fixes: #1497091
Approved by: Gerry Boland

397. By Gerry Boland on 2015-10-21

Workaround for AutoPilot input coordinate positioning being outside screen geometry

398. By CI Train Bot Account on 2015-10-21

Releasing 0.4.6+15.10.20151021-0ubuntu1

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:375
http://jenkins.qa.ubuntu.com/job/qtmir-ci/536/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/232
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/232
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/232/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/114
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/269/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/269/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/114/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/536/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:376
http://jenkins.qa.ubuntu.com/job/qtmir-ci/537/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/233
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/233
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/233/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/115
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/270/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/270/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/115/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/537/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/qtmir/clazy_run]

399. By Michał Sawicz on 2015-11-02

Clean up packaging and fix autopkgtest on armhf
Approved by: Gerry Boland

400. By Michael Terry on 2015-11-02

Support new isTouchApp property to ApplicationInfoInterface and move lifecycle policy logic out of qtmir.

Now that qtmir won't decide policy for suspending anymore, we don't need all the lifecycleException handling in qtmir either. That can move to unity8.

But since the GSettings key for that was registered under the qtmir namespace (and there's no technical reason to migrate settings), I left the schema and classes dealing with GSettings alone, for future use.

401. By Nick Dedekind on 2015-11-02

Support server->client visibility change to stop rendering (lp:#1475678) Fixes: #1475678
Approved by: Daniel d'Andrada

402. By Alan Griffiths on 2015-11-02

Test harness for MirWindowManager (in preparation for more intelligent window management)
Approved by: Gerry Boland

403. By Nick Dedekind on 2015-11-02

Hand Qt millisecond timestamps rather than nanosecond. Fixes: #1510571, #1511076, #1511711
Approved by: Gerry Boland

404. By CI Train Bot Account on 2015-11-02

Releasing 0.4.6+16.04.20151102-0ubuntu1

405. By Nick Dedekind on 2015-11-10

Reverted occlusion detection (lp#1514556) Fixes: #1514556

406. By CI Train Bot Account on 2015-11-10

Releasing 0.4.6+16.04.20151110-0ubuntu1

407. By Gerry Boland on 2015-11-12

Fix armhf builds on Xenial by using -std=gnu99 instead of c99

Fixes this FTBFS on xenial:

In file included from /usr/include/lttng/tracepoint-rcu.h:26:0,
                 from /usr/include/lttng/tracepoint.h:29,
                 from /home/phablet/dev/projects/qtmir/qtmir/BUILD-xen/src/platforms/mirserver/tracepoints.h:10,
                 from /home/phablet/dev/projects/qtmir/qtmir/BUILD-xen/src/platforms/mirserver/tracepoints.c:7:
/usr/include/urcu/arch/generic.h: In function ‘caa_get_cycles’:
/usr/include/urcu/arch/generic.h:165:6: error: ‘CLOCK_MONOTONIC’ undeclared (first use in this function)
  if (caa_unlikely(clock_gettime(CLOCK_MONOTONIC, &ts)))
      ^
/usr/include/urcu/arch/generic.h:165:6: note: each undeclared identifier is reported only once for each function it appears in

Strictly should compile code with -std=gnu99 instead of -std=c99 to have the identifiers SIGEV_SIGNAL, sigeventStruct, and CLOCK_MONOTONIC available. These identifiers are declared when _POSIX_C_SOURCE is set to a value >= 199309L, which is the case with -std=gnu99. I could also have used -D_POSIX_C_SOURCE=199309L -std=c99 or have the macro defined in source code.

Did not impact wily as libuctu only started looking for CLOCK_MONOTONIC in Xenial release.
Approved by: Daniel d'Andrada

408. By CI Train Bot Account on 2015-11-12

Releasing 0.4.6+16.04.20151112-0ubuntu1

409. By Nick Dedekind on 2015-11-13

Update surface textures when dropping frames. Fixes: #1515356
Approved by: Gerry Boland

410. By CI Train Bot Account on 2015-11-13

Releasing 0.4.6+16.04.20151113-0ubuntu1

411. By Gerry Boland on 2015-11-19

Fix use of uninitialized variable
Approved by: Daniel d'Andrada, PS Jenkins bot

412. By Albert Astals Cid on 2015-11-19

Enable Efficient String Construction by default

See http://blog.qt.io/blog/2011/06/13/string-concatenation-with-qstringbuilder/
Approved by: Gerry Boland, PS Jenkins bot

413. By Michał Sawicz on 2015-11-19

Build with clang (tests/gmock fails and is unfixable on our side i'd say)
Approved by: Gerry Boland

414. By Gerry Boland on 2015-11-19

Use pid_t for PIDs.
Approved by: Daniel d'Andrada, PS Jenkins bot

415. By Loïc Molinari on 2015-11-19

Ensured Mir surface items with size less than or equal to zero are not rendered, as it's usually done for standard QtQuick items.
Approved by: Gerry Boland

416. By Nick Dedekind on 2015-11-19

Fix a crash when dropping a surface frame before Qt draws a surface item. Fixes: #1517139
Approved by: Gerry Boland

417. By CI Train Bot Account on 2015-11-19

Releasing 0.4.6+16.04.20151119-0ubuntu1

418. By Daniel d'Andrada on 2015-11-25

Implemented support for cursors set by client surfaces
Approved by: Lukáš Tinkl

419. By Gerry Boland on 2015-11-25

Manage frameSwapped signal/slot connection with MirSurface more strictly to avoid crash.

Direct Signal/slot connections across thread boundaries incur the same risks as any cross-thread calls. While connect/disconnect are thread safe methods, it is possible for a slot to be called while the slot owner is being deconstructed - and so not yet disconnected.

So watch for the Item's window change signal and disconnect signal immediately. Also move slot ownership to MirSurfaceItem to auto-disconnect more aggressively.
 Fixes: #1517571
Approved by: Daniel d'Andrada

420. By Daniel d'Andrada on 2015-11-25

Forward Mir mouse wheel events to the shell cursor Fixes: #1497091
Approved by: Lukáš Tinkl

421. By Daniel d'Andrada on 2015-11-25

Revert revision 415

The commit "Ensured Mir surface items with size less than or equal to zero are not rendered,
as it's usually done for standard QtQuick items." caused a regression.

MirSurface.size was being kept uninitialized, as QSize(-1,-1).

422. By CI Train Bot Account on 2015-11-25

Releasing 0.4.6+16.04.20151125-0ubuntu1

423. By Timo Jyrinki on 2015-12-01

Rebuild against Qt 5.5.1.

424. By Nick Dedekind on 2015-12-10

Politely asks processes to close before resorting to killing Fixes: #1434584
Approved by: Daniel d'Andrada

425. By Daniel d'Andrada on 2015-12-10

Add MirSurfaceItem.fillMode and ensure items and buffer are in sync

Ensure that by the time we enter the phase of updating the scene graph, all qml items are up to date regarding the size of the buffer about to be rendered.

NB: This rendering scheme needs triple buffering to work.
Approved by: Michael Zanetti

426. By Daniel d'Andrada on 2015-12-10

Make Session hold multiple surfaces

+ Standardize MirSurface debug messages and account for multiple surfaces per app
Approved by: Gerry Boland

427. By Michael Terry on 2015-12-10

Don't hold a wakelock on apps that are exempt from lifecycle management.

This supports the new exemptFromLifecycle flag for applications as well as bringing back the internal RunningInBackground state.

The tests were revived from the same branch that removed them when we removed RunningInBackground (revision 400) Fixes: #1518764

428. By CI Train Bot Account on 2015-12-10

Releasing 0.4.7+16.04.20151210-0ubuntu1

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:378
http://jenkins.qa.ubuntu.com/job/qtmir-ci/612/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/308
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/308
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/308/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/190
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/345/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/345/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/190/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/612/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/qtmir/clazy_run]

429. By Cemil Azizoglu on 2015-12-17

compatibility branch for Mir 0.18
Approved by: Gerry Boland, Michał Sawicz

430. By CI Train Bot Account on 2015-12-17

Releasing 0.4.7+16.04.20151217-0ubuntu1

431. By Michał Sawicz on 2015-12-22

No-change rebuild to get -gles in sync
Approved by: Kevin DuBois

432. By CI Train Bot Account on 2015-12-22

Releasing 0.4.7+16.04.20151222-0ubuntu1

433. By Daniel d'Andrada on 2016-01-04

Update Session.fullscreen properties at the right time Fixes: #1525893
Approved by: Gerry Boland

434. By CI Train Bot Account on 2016-01-04

Releasing 0.4.7+16.04.20160104-0ubuntu1

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:378
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/10/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/10/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/qtmir/clazy_run]

435. By Nick Dedekind on 2016-01-22

Fixed issue where stopping the session while suspending was causing app close to stall. Fixes: #1536133

436. By CI Train Bot Account on 2016-01-22

Releasing 0.4.7+16.04.20160122-0ubuntu1

437. By Brandon Schaefer on 2016-01-27

Changes for mir 0.19.

438. By CI Train Bot Account on 2016-01-27

Releasing 0.4.7+16.04.20160127.1-0ubuntu1

439. By Nick Dedekind on 2016-02-08

Added fix and test for closing app during the StoppedResumable state. Fixes: #1541388
Approved by: Michael Zanetti

440. By CI Train Bot Account on 2016-02-08

Releasing 0.4.7+16.04.20160208-0ubuntu1

441. By Nick Dedekind on 2016-02-12

Moved test framework into a static library for quicker recompilation.
Approved by: Gerry Boland

442. By Daniel d'Andrada on 2016-02-12

Remove the useless TaskController

It was just forwarding calls between ApplicationManager and ApplicationCrontroller.
Had no logic of its own.

ApplicationCrontroller was then renamed to TaskController as the latter has a better API and it also keeps ApplicationManager code more or less untouched.

Tests have been improved a bit by better emulating TaskController behavior
Approved by: Nick Dedekind

443. By Daniel d'Andrada on 2016-02-12

Let shell decide the initial surface size Fixes: #1532974
Approved by: Nick Dedekind

444. By Daniel d'Andrada on 2016-02-12

Surface Size Hints
Approved by: Lukáš Tinkl

445. By Albert Astals Cid on 2016-02-12

Reset start time if the timestamp travels to the past
 Fixes: #1524488
Approved by: Nick Dedekind

446. By Albert Astals Cid on 2016-02-12

Provide branch prediction information to the if in compressTimestamp
Approved by: Gerry Boland

447. By Michał Sawicz on 2016-02-12

Use QStandardPaths to determine QML cache location

Also use temporary XDG_CACHE_HOME in ApplicationManagerTests so we don't pollute user's $HOME
Approved by: Unity8 CI Bot, Albert Astals Cid

448. By Daniel d'Andrada on 2016-02-12

Update mir version requirement
Approved by: Nick Dedekind

449. By Michał Sawicz on 2016-02-12

Bump unity-api dependencies
Approved by: Michael Terry

450. By CI Train Bot Account on 2016-02-12

Releasing 0.4.7+16.04.20160212-0ubuntu1

451. By Alan Griffiths on 2016-02-19

Mir 0.20 Release
Approved by: Cemil Azizoglu

452. By CI Train Bot Account on 2016-02-19

Releasing 0.4.7+16.04.20160219-0ubuntu1

453. By Gerry Boland on 2016-03-10

Allow Mir remove command line arguments it understands, before letting Qt process them.
Approved by: Daniel d'Andrada

454. By Alan Griffiths on 2016-03-10

Copy the Window Management work-in-progress from Mir examples.
Approved by: Gerry Boland

455. By Michael Zanetti on 2016-03-10

Add a dedicated property for the inputMethodSurface

When we're hot-plugging screens, the OSK ui might only be created after surfaceCreated() is emitted and we miss that signal. Fixes: #1545286
Approved by: Daniel d'Andrada

456. By Gerry Boland on 2016-03-10

Screen: only enable orientation sensor for internal display.

It's not great, but works around orientation sensor not working after device unplug from monitor. I believe this is because QtUbuntu-Sensors and Platform-api are not dealing properly with multiple accessors of the sensors. Instead only the last accessor gets correct state, and the earlier ones get nothing. Fixes: #1545286
Approved by: Unity8 CI Bot, Michael Zanetti

457. By Daniel d'Andrada on 2016-03-10

Ensure QmlEngine doesn't delete our MirSurfaces
Approved by: Gerry Boland, Unity8 CI Bot

458. By Gerry Boland on 2016-03-10

Ensure ScreenWindow geometry correctly set and used after moving Screen

NB: this will conflict with lp:~unity-team/qtmir/set-display-config, from which this is a cherry-pick Fixes: #1545286
Approved by: Gerry Boland, Unity8 CI Bot

459. By Michael Terry on 2016-03-10

Fix some mocks to use more realistic code paths.

Specifically, MockApplicationController::doAppIdHasProcessId() was returning -1 if the appId was unknown. But that function returns a bool, so the -1 got translated into a true value. So that mocked method returned true for appIds that hadn't been registered yet.

In order to fix that, I decided to rewrite doAppIdHasProcessId to call primaryPidForAppId so that it could be overridden easier in tests. And adjusted the affected tests to all set an ON_CALL(primaryPidForAppId).

(Because otherwise the test has no way to influence the pid used for children -- why do we actually fork off a while(true) process?)

There are several other fixes here for pieces of the mocks that I found were missing while exploring solutions for the above problem:

- I'm actually not 100% clear on why this started being called, but MockSession::name() couldn't create a default value for QString and the gtest framework was bailing when it was called. So I added a default.

- Similarly, if ApplicationManager::authorizeSession() tries to examine an app's commandline, gtest will abort because MockProcInfo::command_line() doesn't have a mock return value. So I added a default.

- And if authorizeSession() lasted long enough to see that the Application object already existed, it deleted the desktop reader object it had made. But the test mocks always returned the same object, so this caused a segfault. I retooled the ApplicationManager tests to return a new object each time DesktopFileReaderFactory::createInstance was called.
Approved by: Gerry Boland, Unity8 CI Bot

460. By Alberto Aguirre on 2016-03-10

Hook MirOpenGLContext::doneCurrent to Screen::doneCurrent

Actually unbind the opengl/egl context when requested.
Approved by: Gerry Boland

461. By Michał Sawicz on 2016-03-10

Drop dummy autopkgtest

It doesn't make sense after all - DEP-8 tests are meant to test packages as-installed, not rebuild them from scratch. This meant that new Mir releases got blocked on this, because old qtmir was trying to build against new Mir, which usually fails, as needs adaptation for API changes.
Approved by: Gerry Boland

462. By CI Train Bot Account on 2016-03-10

Releasing 0.4.7+16.04.20160310.1-0ubuntu1

463. By Nick Dedekind on 2016-03-22

Added setStage for sidestage redesign and removed ExecFlags
Approved by: Daniel d'Andrada

464. By Michał Sawicz on 2016-03-22

Add support for low shell chrome. Fixes: #1535397
Approved by: Gerry Boland

465. By Michał Sawicz on 2016-03-22

Support for switching keyboard layouts Fixes: #1491340, #1524400
Approved by: Michael Terry

466. By CI Train Bot Account on 2016-03-22

Releasing 0.4.8+16.04.20160322.1-0ubuntu1

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:378
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/132/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1114/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/132/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/qtmir/clazy_run]

467. By Daniel van Vugt on 2016-03-29

Don't use preferred_mode_index. Some devices like TVs don't provide a
preferred mode, so preferred_mode_index may be out of range (a clumsy
way to represent 'none'). Instead use the resolution of the current display mode, which should always be in range.

Fixes LP: #1560497 Fixes: #1560497
Approved by: Gerry Boland

468. By CI Train Bot Account on 2016-03-29

Releasing 0.4.8+16.04.20160329.1-0ubuntu1

469. By Michał Sawicz on 2016-03-30

Drop leftover Xs-Testsuite header
Approved by: Unity8 CI Bot, Gerry Boland

470. By CI Train Bot Account on 2016-03-30

Releasing 0.4.8+16.04.20160330-0ubuntu1

471. By Daniel d'Andrada on 2016-04-13

Logging of Qt's OpenGL debug messages now must be enabled via CMake option
Approved by: Gerry Boland

472. By Daniel d'Andrada on 2016-04-13

Application: improve debug logging

Minimize boilerplate in logging code, as well as standardise its format.
Approved by: Gerry Boland

473. By Daniel d'Andrada on 2016-04-13

Remove application screenshot provider

It's no longer needed now that QML provides a "item-snapshot" feature.

Besides, it has no purpose in a surface-based window management.
Approved by: Lukáš Tinkl, Gerry Boland

474. By Daniel d'Andrada on 2016-04-13

MirSurface: replace keymapLayout and keymapVariant with keymap

That's easier for unity8 to use, leads to declarative code.
Approved by: Lukáš Tinkl

475. By Daniel d'Andrada on 2016-04-13

Surface-based window management

- Session is no longer exported to QML. It's now an internal qtmir concept.
Approved by: Gerry Boland

476. By Michał Sawicz on 2016-04-13

Inline -gles packaging.
Approved by: Gerry Boland

477. By CI Train Bot Account on 2016-04-13

Releasing 0.4.8+16.04.20160413-0ubuntu1

478. By Alberto Aguirre on 2016-04-26

Mir 0.22 compatibility
Approved by: Cemil Azizoglu, Kevin DuBois, Brandon Schaefer

479. By CI Train Bot Account on 2016-04-26

Releasing 0.4.8+16.04.20160426-0ubuntu1

480. By Michael Terry on 2016-04-28

Use latest UbuntuAppLaunch API which supports libertine apps.
Approved by: Nick Dedekind

481. By Lukáš Tinkl on 2016-04-28

Regression fix: restore window title handling Fixes: #1563522
Approved by: Nick Dedekind

482. By CI Train Bot Account on 2016-04-28

Releasing 0.4.8+16.04.20160428-0ubuntu1

483. By Gerry Boland on 2016-04-29

Enhance ScreenController & the DisplayConfigurationPolicy to implement dynamic grid units.

- Rename ScreenController to ScreenModel, as it just reflects current screen state, does not offer means to configure it
- ScreenController can update state of existing Screens, based on Mir DisplayConfiguration changes.
- Expand Screen to include scale & form factor properties, with getter/notifier in NativeInterface. This enables the dynamic grid units in the shell
- Add a Unity.Screens qml module to give QML better information about connected screens, and allow basic reconfiguring.
- Implement a basic display configuration policy to set suitable scale and form factor on an external display (needed for dynamic grid units) Fixes: #1573532
Approved by: Unity8 CI Bot, Daniel d'Andrada

484. By CI Train Bot Account on 2016-04-29

Releasing 0.4.8+16.04.20160429.1-0ubuntu1

[Daniel d'Andrada (dandrader)]

So what's the fate of this branch?

[Albert Astals Cid (aacid)]

Gerry always says he wants it in when I complain, but then nothing happens. I guess at this point it probably doesn't merge correctly? I can update it if there's real desire to merge it in.

[lp:~aacid/qtmir/clazy_run]

485. By Daniel d'Andrada on 2016-05-11

Session: Add a blank surface to the public list if it already has child prompt surfaces

A prompt session may come in too early, before its parent session got a chance
to draw its surface's first frame.

Normally that wouldn't be a problem and we could withhold that parent surface until
it's finally drawn to. But unfortunately the application process might be blocked,
unable to draw anything, until its child prompt session gets dismissed.

Because of that we have no option but to expose this blank surface to shell so that
it can display it along with the prompt surface on top of it, so that the user can
interact with it right away and finally unblock the application. Fixes: #1578665
Approved by: Unity8 CI Bot

486. By CI Train Bot Account on 2016-05-11

Releasing 0.4.8+16.04.20160511-0ubuntu1

487. By Daniel d'Andrada on 2016-05-18

Fix ProxySurfaceListModel::countChanged signal
Approved by: Unity8 CI Bot

488. By Daniel d'Andrada on 2016-05-18

Move prompt surfaces from MirSurface to Application and emit firstChanged signal

489. By CI Train Bot Account on 2016-05-18

Releasing 0.4.8+16.04.20160518.1-0ubuntu1

490. By Gerry Boland on 2016-05-20

UAL can throw on creating Application if invalid appId, catch instead of aborting Fixes: #1578258
Approved by: Unity8 CI Bot, Michael Terry

491. By Daniel d'Andrada on 2016-05-20

Application: Don't respawn if closed while still starting up

+ refactoring of Application::onSessionStateChanged to explicitly cover every single internal state on session stopping. Fixes: #1575577
Approved by: Gerry Boland, Unity8 CI Bot, Michael Terry

492. By Alan Griffiths on 2016-05-20

Reduce coupling to MirServer - it has been misused as a context object.
Approved by: Alan Griffiths, Unity8 CI Bot, Daniel d'Andrada

493. By Michał Sawicz on 2016-05-20

Centralize logging categories

The header part is already centralized. Make the cpp the same.

Moves all logging category symbols to the mirserver lib.

Enables mirserver to use logging categories that were previously declared in the Unity.Application module.
Approved by: Unity8 CI Bot, Michael Terry

494. By Daniel d'Andrada on 2016-05-20

Also interpret the cursor names used by Mir client API Fixes: #1447839
Approved by: Unity8 CI Bot, Michał Sawicz

495. By Timo Jyrinki on 2016-05-20

Use FindQt5PlatformSupport to find platform support, other methods not available on Qt 5.6 anymore. Fixes: #1554404
Approved by: Gerry Boland

496. By CI Train Bot Account on 2016-05-20

Releasing 0.4.8+16.10.20160520.1-0ubuntu1

497. By Daniel d'Andrada on 2016-05-25

Bump unity-api versions
Approved by: Lukáš Tinkl

498. By Alan Griffiths on 2016-05-25

Drop the (unused) prototype Window Management code
Approved by: Gerry Boland, Unity8 CI Bot

499. By Daniel d'Andrada on 2016-05-25

Fix mir::scene::Surface focus attribute updates
Approved by: Unity8 CI Bot

500. By Albert Astals Cid on 2016-05-25

Enable workaround_brokenFBOReadBack on various chipsets

Gives for impressive improvements in QSGDefaultDistanceFieldGlyphCache::storeGlyphs
impressive = 788ms -> 6ms

Copied from qtubuntu
 Fixes: #1581123
Approved by: Gerry Boland, Unity8 CI Bot

501. By Alan Griffiths on 2016-05-25

Remove workaround for lp:1502200
Approved by: Unity8 CI Bot, Daniel d'Andrada

502. By CI Train Bot Account on 2016-05-25

Releasing 0.4.8+16.10.20160525.2-0ubuntu1

503. By Michael Zanetti on 2016-06-06

Adding ApplicationInfo::surfaceCount property

504. By Albert Astals Cid on 2016-06-06

Add support for compiler sanitizers via ECM

505. By Albert Astals Cid on 2016-06-06

Compile with -fsanitize=undefined

506. By Albert Astals Cid on 2016-06-06

Fix leak in ScreensModelTest (LP: #1585502)

507. By Albert Astals Cid on 2016-06-06

Fix leak in SessionManager test (LP: #1585498)

508. By Albert Astals Cid on 2016-06-06

Remove unused m_sessions member

509. By Albert Astals Cid on 2016-06-06

Add missing breaks

510. By Albert Astals Cid on 2016-06-06

Initialize m_lastX and m_lastY

511. By Albert Astals Cid on 2016-06-06

Initialize m_sessionId

512. By Albert Astals Cid on 2016-06-06

Give the locker a name

513. By Albert Astals Cid on 2016-06-06

Fix memory leak in QtEventFeederTest (LP: #1585503)

514. By Albert Astals Cid on 2016-06-06

Fix leaks in application_manager_test (LP: #1585501)

515. By Daniel d'Andrada on 2016-06-06

Improve Session debug logging

516. By Daniel d'Andrada on 2016-06-06

MirSurfaceListModel: prepending a surface always causes firstChanged() emission

517. By CI Train Bot Account on 2016-06-06

Releasing 0.4.8+16.10.20160606.1-0ubuntu1

518. By Albert Astals Cid on 2016-06-06

Merge system_includes

519. By Albert Astals Cid on 2016-06-06

clazy_fixes

520. By Albert Astals Cid on 2016-06-06

build++

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:519
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/261/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/1884/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1910
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1846
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1846
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1846
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1837/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1837/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1837/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1837/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1837/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1837/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1837/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1837/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1837/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/261/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/qtmir/clazy_run]

521. By Albert Astals Cid on 2016-06-23

Merge trunk

522. By Albert Astals Cid on 2016-07-15

Merge

523. By Albert Astals Cid on 2016-08-08

Merge

524. By Albert Astals Cid on 2016-08-08

Merge

525. By Albert Astals Cid on 2016-08-08

wops, remove

526. By Albert Astals Cid on 2016-08-08

spacing

527. By Albert Astals Cid on 2016-08-08

Remove change that conflicts with other branch removing this code

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-05-18 20:56:14 +0000
+++ CMakeLists.txt	2016-06-06 19:34:22 +0000
@@ -13,6 +13,13 @@
 # Find includes in corresponding build directories
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
+find_package (ECM 1.7.0 QUIET NO_MODULE)
+if (ECM_FOUND)
+    # Provides us with -DECM_ENABLE_SANITIZERS='X'
+    # Where X can be address, thread, memory, leak, undefined
+    include("${ECM_MODULE_DIR}/ECMEnableSanitizers.cmake")
+endif()
+
 # add custom cmake modules
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 
@@ -76,23 +83,21 @@
 pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
 pkg_check_modules(QTDBUSTEST libqtdbustest-1 REQUIRED)
 pkg_check_modules(QTDBUSMOCK libqtdbusmock-1 REQUIRED)
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=17)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=18)
 
-include_directories(${APPLICATION_API_INCLUDE_DIRS})
+include_directories(SYSTEM ${APPLICATION_API_INCLUDE_DIRS})
 
 add_definitions(-DMIR_REQUIRE_DEPRECATED_EVENT_OPT_IN=1)
 
 # Use the fast string builder
 add_definitions(-DQT_USE_QSTRINGBUILDER)
 
-include_directories( ${APPLICATION_API_INCLUDE_DIRS} )
-
 # We expect this to be set via debian/rules for GLES builds
 if ("${USE_OPENGLES}" STREQUAL 1)
     message(STATUS "Qt5 determined to be compiled with GLES support")
     pkg_check_modules(GLESv2 glesv2)
     add_definitions(-DQT_USING_GLES)
-    include_directories (${GLESv2_INCLUDE_DIRS})
+    include_directories (SYSTEM ${GLESv2_INCLUDE_DIRS})
     set (GL_LIBRARIES "${GLESv2_LIBRARIES}")
 # Because qt/gl and qt/gles are not parallel installable we have a difficulty
 # building qtmir-desktop on armhf. We would like to link against opengl and bind the
@@ -103,13 +108,13 @@
     message(STATUS "Linking against OpenGL ES but binding OpenGL API")
     pkg_check_modules(GLESv2 glesv2)
     add_definitions(-DQT_USING_GL)
-    include_directories (${GLESv2_INCLUDE_DIRS})
+    include_directories (SYSTEM ${GLESv2_INCLUDE_DIRS})
     set (GL_LIBRARIES "${GLESv2_LIBRARIES}")
 else()
     message(STATUS "Qt5 determined to be compiled with OpenGL support")
     pkg_check_modules(GL gl)
     add_definitions(-DQT_USING_OPENGL)
-    include_directories (${GL_INCLUDE_DIRS})
+    include_directories (SYSTEM ${GL_INCLUDE_DIRS})
 endif()
 
 # Standard install paths

=== modified file 'debian/changelog'
--- debian/changelog	2016-05-25 13:54:56 +0000
+++ debian/changelog	2016-06-06 19:34:22 +0000
@@ -1,3 +1,28 @@
+qtmir (0.4.8+16.10.20160606.1-0ubuntu1) yakkety; urgency=medium
+
+  [ Albert Astals Cid ]
+  * Add support for compiler sanitizers via ECM
+  * Compile with -fsanitize=undefined
+  * Fix leak in ScreensModelTest (LP: #1585502)
+  * Fix leak in SessionManager test (LP: #1585498)
+  * Remove unused m_sessions member
+  * Add missing breaks
+  * Initialize m_lastX and m_lastY
+  * Initialize m_sessionId
+  * Give the locker a name
+  * Fix memory leak in QtEventFeederTest (LP: #1585503)
+  * Fix leaks in application_manager_test (LP: #1585501)
+
+  [ Daniel d'Andrada ]
+  * Improve Session debug logging
+  * MirSurfaceListModel: prepending a surface always causes
+    firstChanged() emission
+
+  [ Michael Zanetti ]
+  * Adding ApplicationInfo::surfaceCount property
+
+ -- Michał Sawicz <[e-mail]>  Mon, 06 Jun 2016 15:45:57 +0000
+
 qtmir (0.4.8+16.10.20160525.2-0ubuntu1) yakkety; urgency=medium
 
   [ Alan Griffiths ]

=== modified file 'debian/control'
--- debian/control	2016-05-18 20:56:14 +0000
+++ debian/control	2016-06-06 19:34:22 +0000
@@ -22,7 +22,7 @@
                libubuntu-app-launch2-dev (>= 0.9),
                libubuntu-application-api-dev (>= 2.1.0),
                libudev-dev,
-               libunity-api-dev (>= 7.113),
+               libunity-api-dev (>= 7.114),
                liburl-dispatcher1-dev,
                libxkbcommon-dev,
                libxrender-dev,

=== modified file 'demos/qml-demo-client/CMakeLists.txt'
--- demos/qml-demo-client/CMakeLists.txt	2015-09-01 16:16:47 +0000
+++ demos/qml-demo-client/CMakeLists.txt	2016-06-06 19:34:22 +0000
@@ -2,19 +2,16 @@
 configure_file(${DEMO_CLIENT}.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${DEMO_CLIENT}.desktop @ONLY)
 
 include_directories(
+    SYSTEM
     ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
+    ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
+    ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
 )
 
 add_executable(${DEMO_CLIENT}
     main.cpp
 )
 
-include_directories(
-    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
-    ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
-    ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
-)
-
 target_link_libraries(
     ${DEMO_CLIENT}
     Qt5::Core

=== modified file 'demos/qml-demo-shell/CMakeLists.txt'
--- demos/qml-demo-shell/CMakeLists.txt	2015-09-01 16:16:47 +0000
+++ demos/qml-demo-shell/CMakeLists.txt	2016-06-06 19:34:22 +0000
@@ -1,19 +1,16 @@
 set(DEMO_SHELL qtmir-demo-shell)
 
 include_directories(
+    SYSTEM
     ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
+    ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
+    ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
 )
 
 add_executable(${DEMO_SHELL}
     main.cpp
 )
 
-include_directories(
-    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
-    ${Qt5Qml_PRIVATE_INCLUDE_DIRS}
-    ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
-)
-
 target_link_libraries(
     ${DEMO_SHELL}
     Qt5::Core

=== modified file 'src/common/debughelpers.cpp'
--- src/common/debughelpers.cpp	2015-11-10 11:07:23 +0000
+++ src/common/debughelpers.cpp	2016-06-06 19:34:22 +0000
@@ -54,6 +54,7 @@
         break;
     case QEvent::TouchCancel:
         message.append("TouchCancel ");
+        break;
     default:
         message.append("TouchUNKNOWN ");
     }
@@ -62,7 +63,7 @@
 
         const QTouchEvent::TouchPoint& touchPoint = ev->touchPoints().at(i);
         message.append(
-            QString("(id:%1, state:%2, scenePos:(%3,%4), pos:(%5,%6)) ")
+            QStringLiteral("(id:%1, state:%2, scenePos:(%3,%4), pos:(%5,%6)) ")
                 .arg(touchPoint.id())
                 .arg(touchPointStateToString(touchPoint.state()))
                 .arg(touchPoint.scenePos().x())
@@ -81,30 +82,30 @@
 
     switch (attrib) {
     case mir_surface_attrib_type:
-        str = QString("type=%1").arg(mirSurfaceTypeToStr(value));
+        str = QStringLiteral("type=%1").arg(mirSurfaceTypeToStr(value));
         break;
 
     case mir_surface_attrib_state:
-        str = QString("state=%1").arg(mirSurfaceStateToStr(value));
+        str = QStringLiteral("state=%1").arg(mirSurfaceStateToStr(value));
         break;
 
     case mir_surface_attrib_swapinterval:
-        str = QString("swapinterval=%1").arg(value);
+        str = QStringLiteral("swapinterval=%1").arg(value);
         break;
 
     case mir_surface_attrib_focus:
-        str = QString("focus=%1").arg(mirSurfaceFocusStateToStr(value));
+        str = QStringLiteral("focus=%1").arg(mirSurfaceFocusStateToStr(value));
         break;
 
     case mir_surface_attrib_dpi:
-        str = QString("dpi=%1").arg(value);
+        str = QStringLiteral("dpi=%1").arg(value);
         break;
 
     case mir_surface_attrib_visibility:
-        str = QString("visibility=%1").arg(mirSurfaceVisibilityToStr(value));
+        str = QStringLiteral("visibility=%1").arg(mirSurfaceVisibilityToStr(value));
         break;
     default:
-        str = QString("type'%1'=%2").arg((int)attrib).arg(value);
+        str = QStringLiteral("type'%1'=%2").arg((int)attrib).arg(value);
     }
 
     return str;
@@ -210,7 +211,7 @@
 
 QString mirPointerEventToString(MirPointerEvent const* event)
 {
-    QString string = QString("MirPointerEvent(x=%1,y=%2,relative_x=%3,relative_y=%4)")
+    QString string = QStringLiteral("MirPointerEvent(x=%1,y=%2,relative_x=%3,relative_y=%4)")
         .arg(mir_pointer_event_axis_value(event, mir_pointer_axis_x))
         .arg(mir_pointer_event_axis_value(event, mir_pointer_axis_y))
         .arg(mir_pointer_event_axis_value(event, mir_pointer_axis_relative_x))
@@ -223,7 +224,7 @@
 {
     const int pointerCount = mir_touch_event_point_count(event);
 
-    QString string("MirTouchEvent(");
+    QString string(QStringLiteral("MirTouchEvent("));
 
     for (int i = 0; i < pointerCount; ++i) {
 
@@ -233,7 +234,7 @@
 
         MirTouchAction touchAction = mir_touch_event_action(event, i);
 
-        QString touchStr = QString("(id=%1,action=%2,x=%3,y=%4)")
+        QString touchStr = QStringLiteral("(id=%1,action=%2,x=%3,y=%4)")
             .arg(mir_touch_event_id(event, i))
             .arg(mirTouchActionToString(touchAction))
             .arg(mir_touch_event_axis_value(event, i, mir_touch_axis_x))
@@ -290,7 +291,7 @@
 
     xkb_keysym_t keyCode = mir_keyboard_event_key_code(event);
 
-    return QString("MirKeyboardEvent(action=%1,key_code=0x%2)")
+    return QStringLiteral("MirKeyboardEvent(action=%1,key_code=0x%2)")
         .arg(mirKeyboardActionToString(keyboardAction))
         .arg(keyCode, 4, 16, QLatin1Char('0'));
 }

=== modified file 'src/modules/Unity/Application/CMakeLists.txt'
--- src/modules/Unity/Application/CMakeLists.txt	2016-04-26 08:56:36 +0000
+++ src/modules/Unity/Application/CMakeLists.txt	2016-06-06 19:34:22 +0000
@@ -1,4 +1,10 @@
 include_directories(
+    ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
+    ${CMAKE_SOURCE_DIR}/src/common
+)
+
+include_directories(
+  SYSTEM
     ${GLIB_INCLUDE_DIRS}
     ${GIO_INCLUDE_DIRS}
     ${GIO_UNIX_INCLUDE_DIRS}
@@ -7,8 +13,6 @@
     ${PROCESS_CPP_INCLUDE_DIRS}
     ${UBUNTU_PLATFORM_API_INCLUDE_DIRS}
     ${UBUNTU_APP_LAUNCH_INCLUDE_DIRS}
-    ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
-    ${CMAKE_SOURCE_DIR}/src/common
     ${GSETTINGS_QT_INCLUDE_DIRS}
 
     ${LTTNG_INCLUDE_DIRS}

=== modified file 'src/modules/Unity/Application/application.cpp'
--- src/modules/Unity/Application/application.cpp	2016-05-25 13:54:52 +0000
+++ src/modules/Unity/Application/application.cpp	2016-06-06 19:34:22 +0000
@@ -55,6 +55,8 @@
     , m_processState(ProcessUnknown)
     , m_stopTimer(nullptr)
     , m_exemptFromLifecycle(false)
+    , m_proxySurfaceList(new ProxySurfaceListModel(this))
+    , m_proxyPromptSurfaceList(new ProxySurfaceListModel(this))
 {
     DEBUG_MSG << "()";
 
@@ -66,6 +68,8 @@
     m_rotatesWindowContents = m_appInfo->rotatesWindowContents();
 
     setStopTimer(new Timer);
+
+    connect(m_proxySurfaceList, &unityapp::MirSurfaceListInterface::countChanged, this, &unityapp::ApplicationInfoInterface::surfaceCountChanged);
 }
 
 Application::~Application()
@@ -170,8 +174,8 @@
             color.setAlpha(255);
         } else {
             color.setRgba(qRgba(0, 0, 0, 0));
-            qCWarning(QTMIR_APPLICATIONS) << QString("Invalid %1: \"%2\"")
-                .arg(colorName).arg(colorString);
+            qCWarning(QTMIR_APPLICATIONS) << QStringLiteral("Invalid %1: \"%2\"")
+                .arg(colorName, colorString);
         }
     }
 
@@ -411,8 +415,8 @@
 bool Application::focused() const
 {
     bool someSurfaceHasFocus = false; // to be proven wrong
-    for (int i = 0; i < m_proxySurfaceList.rowCount() && !someSurfaceHasFocus; ++i) {
-        someSurfaceHasFocus |= m_proxySurfaceList.get(i)->focused();
+    for (int i = 0; i < m_proxySurfaceList->rowCount() && !someSurfaceHasFocus; ++i) {
+        someSurfaceHasFocus |= m_proxySurfaceList->get(i)->focused();
     }
     return someSurfaceHasFocus;
 }
@@ -462,7 +466,7 @@
     m_pid = pid;
 }
 
-void Application::setArguments(const QStringList arguments)
+void Application::setArguments(const QStringList &arguments)
 {
     m_arguments = arguments;
 }
@@ -475,8 +479,8 @@
         return;
 
     if (m_session) {
-        m_proxySurfaceList.setSourceList(nullptr);
-        m_proxyPromptSurfaceList.setSourceList(nullptr);
+        m_proxySurfaceList->setSourceList(nullptr);
+        m_proxyPromptSurfaceList->setSourceList(nullptr);
         m_session->disconnect(this);
         m_session->surfaceList()->disconnect(this);
         m_session->setApplication(nullptr);
@@ -517,8 +521,8 @@
         if (oldFullscreen != fullscreen())
             Q_EMIT fullscreenChanged(fullscreen());
 
-        m_proxySurfaceList.setSourceList(m_session->surfaceList());
-        m_proxyPromptSurfaceList.setSourceList(m_session->promptSurfaceList());
+        m_proxySurfaceList->setSourceList(m_session->surfaceList());
+        m_proxyPromptSurfaceList->setSourceList(m_session->promptSurfaceList());
     } else {
         // this can only happen after the session has stopped
         Q_ASSERT(m_state == InternalState::Stopped || m_state == InternalState::StoppedResumable
@@ -734,7 +738,7 @@
 
 void Application::acquireWakelock() const
 {
-    if (appId() == "unity8-dash")
+    if (appId() == QLatin1String("unity8-dash"))
         return;
 
     m_sharedWakelock->acquire(this);
@@ -742,7 +746,7 @@
 
 void Application::releaseWakelock() const
 {
-    if (appId() == "unity8-dash")
+    if (appId() == QLatin1String("unity8-dash"))
         return;
 
     m_sharedWakelock->release(this);
@@ -852,21 +856,21 @@
     }
 }
 
-unityapp::MirSurfaceListInterface* Application::surfaceList()
+unityapp::MirSurfaceListInterface* Application::surfaceList() const
 {
-    return &m_proxySurfaceList;
+    return m_proxySurfaceList;
 }
 
-unityapp::MirSurfaceListInterface* Application::promptSurfaceList()
+unityapp::MirSurfaceListInterface* Application::promptSurfaceList() const
 {
-    return &m_proxyPromptSurfaceList;
+    return m_proxyPromptSurfaceList;
 }
 
 void Application::requestFocus()
 {
-    if (m_proxySurfaceList.rowCount() > 0) {
+    if (m_proxySurfaceList->rowCount() > 0) {
         DEBUG_MSG << "() - Requesting focus for most recent app surface";
-        m_proxySurfaceList.get(0)->requestFocus();
+        m_proxySurfaceList->get(0)->requestFocus();
     } else {
         DEBUG_MSG << "() - emitting focusRequested()";
         Q_EMIT focusRequested();

=== modified file 'src/modules/Unity/Application/application.h'
--- src/modules/Unity/Application/application.h	2016-05-20 08:41:17 +0000
+++ src/modules/Unity/Application/application.h	2016-06-06 19:34:22 +0000
@@ -108,8 +108,9 @@
     void setExemptFromLifecycle(bool) override;
     QSize initialSurfaceSize() const override;
     void setInitialSurfaceSize(const QSize &size) override;
-    unity::shell::application::MirSurfaceListInterface* surfaceList() override;
-    unity::shell::application::MirSurfaceListInterface* promptSurfaceList() override;
+    unity::shell::application::MirSurfaceListInterface* surfaceList() const override;
+    unity::shell::application::MirSurfaceListInterface* promptSurfaceList() const override;
+    int surfaceCount() const override { return surfaceList()->count(); }
 
     ProcessState processState() const { return m_processState; }
     void setProcessState(ProcessState value);
@@ -159,7 +160,7 @@
     void acquireWakelock() const;
     void releaseWakelock() const;
     void setPid(pid_t pid);
-    void setArguments(const QStringList arguments);
+    void setArguments(const QStringList &arguments);
     void setInternalState(InternalState state);
     void wipeQMLCache();
     void suspend();
@@ -190,8 +191,8 @@
     QSize m_initialSurfaceSize;
     bool m_closing{false};
 
-    ProxySurfaceListModel m_proxySurfaceList;
-    ProxySurfaceListModel m_proxyPromptSurfaceList;
+    ProxySurfaceListModel *m_proxySurfaceList;
+    ProxySurfaceListModel *m_proxyPromptSurfaceList;
 
     friend class ApplicationManager;
     friend class SessionManager;

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2016-05-06 08:41:15 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2016-06-06 19:34:22 +0000
@@ -64,12 +64,12 @@
 
 // FIXME: To be removed once shell has fully adopted short appIds!!
 QString toShortAppIdIfPossible(const QString &appId) {
-    QRegExp longAppIdMask("[a-z0-9][a-z0-9+.-]+_[a-zA-Z0-9+.-]+_[0-9][a-zA-Z0-9.+:~-]*");
+    QRegExp longAppIdMask(QStringLiteral("[a-z0-9][a-z0-9+.-]+_[a-zA-Z0-9+.-]+_[0-9][a-zA-Z0-9.+:~-]*"));
     if (longAppIdMask.exactMatch(appId)) {
         qWarning() << "WARNING: long App ID encountered:" << appId;
         // input string a long AppId, chop the version string off the end
-        QStringList parts = appId.split("_");
-        return QString("%1_%2").arg(parts.first()).arg(parts.at(1));
+        QStringList parts = appId.split(QStringLiteral("_"));
+        return QStringLiteral("%1_%2").arg(parts.first(), parts.at(1));
     }
     return appId;
 }
@@ -183,7 +183,7 @@
     , m_settings(settings)
 {
     qCDebug(QTMIR_APPLICATIONS) << "ApplicationManager::ApplicationManager (this=%p)" << this;
-    setObjectName("qtmir::ApplicationManager");
+    setObjectName(QStringLiteral("qtmir::ApplicationManager"));
 
     /*
         All begin[...]Rows() and end[...]Rows() functions cause signal emissions which can
@@ -532,7 +532,7 @@
 
     qCDebug(QTMIR_APPLICATIONS) << "ApplicationManager::authorizeSession - pid=" << pid;
 
-    for (Application *app : m_applications) {
+    Q_FOREACH (Application *app, m_applications) {
         if (app->state() == Application::Starting) {
             tracepoint(qtmir, appIdHasProcessId_start);
             if (m_taskController->appIdHasProcessId(app->appId(), pid)) {
@@ -572,7 +572,7 @@
     }
 
     // Guess appId from the desktop file hint
-    const QString appId = toShortAppIdIfPossible(desktopFileName.split('/').last().remove(QRegExp(".desktop$")));
+    const QString appId = toShortAppIdIfPossible(desktopFileName.split('/').last().remove(QRegExp(QStringLiteral(".desktop$"))));
 
     qCDebug(QTMIR_APPLICATIONS) << "Process supplied desktop_file_hint, loading:" << appId;
 
@@ -598,7 +598,7 @@
     Application::Stage stage = Application::MainStage;
     QString stageParam = info->getParameter("--stage_hint=");
 
-    if (stageParam == "side_stage") {
+    if (stageParam == QLatin1String("side_stage")) {
         stage = Application::SideStage;
     }
 
@@ -654,7 +654,7 @@
     return findApplicationWithPid(session->process_id());
 }
 
-Application* ApplicationManager::findApplicationWithPid(const pid_t pid)
+Application* ApplicationManager::findApplicationWithPid(const pid_t pid) const
 {
     if (pid <= 0)
         return nullptr;
@@ -878,7 +878,7 @@
 
 Application *ApplicationManager::findApplication(qtmir::MirSurfaceInterface* surface)
 {
-    for (Application *app : m_applications) {
+    Q_FOREACH (Application *app, m_applications) {
         if (app->session() == surface->session()) {
             return app;
         }

=== modified file 'src/modules/Unity/Application/application_manager.h'
--- src/modules/Unity/Application/application_manager.h	2016-05-05 15:02:01 +0000
+++ src/modules/Unity/Application/application_manager.h	2016-06-06 19:34:22 +0000
@@ -96,7 +96,7 @@
     bool isEmpty() const { return rowCount() == 0; }
 
     const QList<Application*> &list() const { return m_applications; }
-    qtmir::Application* findApplicationWithPid(const pid_t pid);
+    qtmir::Application* findApplicationWithPid(const pid_t pid) const;
 
 public Q_SLOTS:
     void authorizeSession(const pid_t pid, bool &authorized);

=== modified file 'src/modules/Unity/Application/dbuswindowstack.cpp'
--- src/modules/Unity/Application/dbuswindowstack.cpp	2016-01-20 21:36:39 +0000
+++ src/modules/Unity/Application/dbuswindowstack.cpp	2016-06-06 19:34:22 +0000
@@ -33,9 +33,9 @@
     qDBusRegisterMetaType<WindowInfo>();
     qDBusRegisterMetaType< QList<WindowInfo> >();
 
-    QDBusConnection::sessionBus().registerService("com.canonical.Unity.WindowStack");
+    QDBusConnection::sessionBus().registerService(QStringLiteral("com.canonical.Unity.WindowStack"));
     // TODO ExportScriptableSlots shouldn't be needed but without it i don't get the methods :-/
-    QDBusConnection::sessionBus().registerObject("/com/canonical/Unity/WindowStack", this, QDBusConnection::ExportAllSignals | QDBusConnection::ExportScriptableSlots |QDBusConnection::ExportScriptableInvokables );
+    QDBusConnection::sessionBus().registerObject(QStringLiteral("/com/canonical/Unity/WindowStack"), this, QDBusConnection::ExportAllSignals | QDBusConnection::ExportScriptableSlots |QDBusConnection::ExportScriptableInvokables );
 }
 
 DBusWindowStack::~DBusWindowStack()
@@ -49,7 +49,7 @@
     const Application *app = appMgr->findApplicationWithPid(pid);
     if (app) {
         res.app_id = app->appId();
-        res.desktop_file = "";
+        res.desktop_file = QString();
     }
     return res;
 }
@@ -59,6 +59,7 @@
     QList<WindowInfo> res;
     ApplicationManager *appMgr = static_cast<ApplicationManager*>(parent());
     const QList<Application*> &applications = appMgr->list();
+    res.reserve(applications.count());
     Q_FOREACH(Application* app, applications) {
         WindowInfo wi;
         wi.window_id = 0;

=== modified file 'src/modules/Unity/Application/mirbuffersgtexture.cpp'
--- src/modules/Unity/Application/mirbuffersgtexture.cpp	2015-12-10 13:08:43 +0000
+++ src/modules/Unity/Application/mirbuffersgtexture.cpp	2016-06-06 19:34:22 +0000
@@ -51,7 +51,7 @@
     m_height = 0;
 }
 
-void MirBufferSGTexture::setBuffer(std::shared_ptr<mir::graphics::Buffer> buffer)
+void MirBufferSGTexture::setBuffer(const std::shared_ptr<mir::graphics::Buffer>& buffer)
 {
     m_mirBuffer = buffer;
     mg::Size size = buffer->size();

=== modified file 'src/modules/Unity/Application/mirbuffersgtexture.h'
--- src/modules/Unity/Application/mirbuffersgtexture.h	2015-09-28 09:57:18 +0000
+++ src/modules/Unity/Application/mirbuffersgtexture.h	2016-06-06 19:34:22 +0000
@@ -32,7 +32,7 @@
     MirBufferSGTexture();
     virtual ~MirBufferSGTexture();
 
-    void setBuffer(std::shared_ptr<mir::graphics::Buffer> buffer);
+    void setBuffer(const std::shared_ptr<mir::graphics::Buffer>& buffer);
     void freeBuffer();
     bool hasBuffer() const;
 

=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
--- src/modules/Unity/Application/mirsurface.cpp	2016-05-25 13:54:52 +0000
+++ src/modules/Unity/Application/mirsurface.cpp	2016-06-06 19:34:22 +0000
@@ -835,7 +835,7 @@
 
 void MirSurface::applyKeymap()
 {
-    QStringList stringList = m_keymap.split("+", QString::SkipEmptyParts);
+    QStringList stringList = m_keymap.split('+', QString::SkipEmptyParts);
 
     QString layout = stringList[0];
     QString variant;

=== modified file 'src/modules/Unity/Application/mirsurfaceitem.cpp'
--- src/modules/Unity/Application/mirsurfaceitem.cpp	2016-05-24 20:13:10 +0000
+++ src/modules/Unity/Application/mirsurfaceitem.cpp	2016-06-06 19:34:22 +0000
@@ -61,7 +61,7 @@
 {
     Q_OBJECT
 public:
-    MirTextureProvider(QSharedPointer<QSGTexture> texture) : t(texture) {}
+    MirTextureProvider(const QSharedPointer<QSGTexture>& texture) : t(texture) {}
     QSGTexture *texture() const {
         if (t)
             t->setFiltering(smooth ? QSGTexture::Linear : QSGTexture::Nearest);
@@ -74,7 +74,7 @@
         t.reset();
     }
 
-    void setTexture(QSharedPointer<QSGTexture> newTexture) {
+    void setTexture(const QSharedPointer<QSGTexture>& newTexture) {
         t = newTexture;
     }
 
@@ -242,7 +242,7 @@
     }
 
     if (m_surface->numBuffersReadyForCompositor() > 0) {
-        QTimer::singleShot(0, this, SLOT(update()));
+        QTimer::singleShot(0, this, &MirSurfaceItem::update);
     }
 
     m_textureProvider->smooth = smooth();
@@ -388,7 +388,7 @@
     if (m_surface) {
         return m_surface->appId();
     } else {
-        return QString("-");
+        return QStringLiteral("-");
     }
 }
 
@@ -433,7 +433,7 @@
             Qt::TouchPointStates touchPointStates)
 {
     if (eventType == QEvent::TouchBegin && m_lastTouchEvent && m_lastTouchEvent->type != QEvent::TouchEnd) {
-        qCWarning(QTMIR_SURFACES) << qPrintable(QString("MirSurfaceItem(%1) - Got a QEvent::TouchBegin while "
+        qCWarning(QTMIR_SURFACES) << qPrintable(QStringLiteral("MirSurfaceItem(%1) - Got a QEvent::TouchBegin while "
             "there's still an active/unfinished touch sequence.").arg(appId()));
         // Qt forgot to end the last touch sequence. Let's do it ourselves.
         endCurrentTouchSequence(timestamp);
@@ -749,7 +749,7 @@
     }
 }
 
-void MirSurfaceItem::onActualSurfaceSizeChanged(const QSize &size)
+void MirSurfaceItem::onActualSurfaceSizeChanged(QSize size)
 {
     setImplicitSize(size.width(), size.height());
 }

=== modified file 'src/modules/Unity/Application/mirsurfaceitem.h'
--- src/modules/Unity/Application/mirsurfaceitem.h	2016-05-24 20:13:10 +0000
+++ src/modules/Unity/Application/mirsurfaceitem.h	2016-06-06 19:34:22 +0000
@@ -119,7 +119,7 @@
     void updateMirSurfaceActiveFocus();
     void updateMirSurfaceVisibility();
 
-    void onActualSurfaceSizeChanged(const QSize &size);
+    void onActualSurfaceSizeChanged(QSize size);
     void onCompositorSwappedBuffers();
 
     void onWindowChanged(QQuickWindow *window);

=== modified file 'src/modules/Unity/Application/mirsurfacelistmodel.cpp'
--- src/modules/Unity/Application/mirsurfacelistmodel.cpp	2016-05-17 19:57:52 +0000
+++ src/modules/Unity/Application/mirsurfacelistmodel.cpp	2016-06-06 19:34:22 +0000
@@ -20,6 +20,9 @@
 
 #include <paths.h>
 
+#include <QDebug>
+#include <QDebugStateSaver>
+
 namespace unityapp = unity::shell::application;
 using namespace qtmir;
 
@@ -65,11 +68,11 @@
     m_surfaceList.prepend(surface);
     connectSurface(surface);
     endInsertRows();
-    Q_EMIT countChanged();
+    Q_EMIT countChanged(m_surfaceList.count());
     if (count() == 1) {
         Q_EMIT emptyChanged();
-        Q_EMIT firstChanged();
     }
+    Q_EMIT firstChanged();
 }
 
 void MirSurfaceListModel::connectSurface(MirSurfaceInterface *surface)
@@ -85,7 +88,7 @@
         beginRemoveRows(QModelIndex(), i, i);
         m_surfaceList.removeAt(i);
         endRemoveRows();
-        Q_EMIT countChanged();
+        Q_EMIT countChanged(m_surfaceList.count());
         if (count() == 0) {
             Q_EMIT emptyChanged();
         }
@@ -147,7 +150,7 @@
                 });
     }
     endInsertRows();
-    Q_EMIT countChanged();
+    Q_EMIT countChanged(m_surfaceList.count());
     if (wasEmpty) {
         Q_EMIT emptyChanged();
     }
@@ -207,6 +210,11 @@
 // ProxySurfaceListModel
 //////////////////////////////////////////////////////////////////////////////
 
+ProxySurfaceListModel::ProxySurfaceListModel(QObject *parent):
+    unity::shell::application::MirSurfaceListInterface(parent)
+{
+}
+
 void ProxySurfaceListModel::setSourceList(MirSurfaceListModel *sourceList)
 {
     if (m_sourceList == sourceList)
@@ -284,3 +292,21 @@
 
     return m_sourceList->data(index, role);
 }
+
+QDebug operator<<(QDebug dbg, const unityapp::MirSurfaceListInterface &surfaceListConst)
+{
+    auto surfaceList = const_cast<unityapp::MirSurfaceListInterface*>(&surfaceListConst);
+
+    QDebugStateSaver saver(dbg);
+    dbg.nospace();
+    dbg << "MirSurfaceList(";
+    for (int i = 0; i < surfaceList->count(); ++i) {
+        if (i > 0) {
+            dbg << ", ";
+        }
+        auto surface = surfaceList->get(i);
+        dbg << (void*)surface;
+    }
+    dbg << ')';
+    return dbg;
+}

=== modified file 'src/modules/Unity/Application/mirsurfacelistmodel.h'
--- src/modules/Unity/Application/mirsurfacelistmodel.h	2016-05-10 21:06:21 +0000
+++ src/modules/Unity/Application/mirsurfacelistmodel.h	2016-06-06 19:34:22 +0000
@@ -81,6 +81,7 @@
 {
     Q_OBJECT
 public:
+    ProxySurfaceListModel(QObject *parent = nullptr);
     void setSourceList(MirSurfaceListModel *sourceList);
 
     Q_INVOKABLE unity::shell::application::MirSurfaceInterface *get(int index) override;
@@ -94,4 +95,6 @@
 
 } // namespace qtmir
 
+QDebug operator<<(QDebug, const unity::shell::application::MirSurfaceListInterface &);
+
 #endif // QTMIR_MIRSURFACELISTMODEL_H

=== modified file 'src/modules/Unity/Application/mirsurfacemanager.cpp'
--- src/modules/Unity/Application/mirsurfacemanager.cpp	2016-05-06 08:41:15 +0000
+++ src/modules/Unity/Application/mirsurfacemanager.cpp	2016-06-06 19:34:22 +0000
@@ -85,7 +85,7 @@
     , m_sessionManager(sessionManager)
 {
     qCDebug(QTMIR_SURFACES) << "MirSurfaceManager::MirSurfaceManager - this=" << this;
-    setObjectName("qtmir::SurfaceManager");
+    setObjectName(QStringLiteral("qtmir::SurfaceManager"));
 }
 
 MirSurfaceManager::~MirSurfaceManager()
@@ -98,7 +98,7 @@
 void MirSurfaceManager::onSessionCreatedSurface(const mir::scene::Session *mirSession,
                                                 const std::shared_ptr<mir::scene::Surface> &surface,
                                                 const std::shared_ptr<SurfaceObserver> &observer,
-                                                qtmir::CreationHints creationHints)
+                                                const qtmir::CreationHints &creationHints)
 {
     qCDebug(QTMIR_SURFACES) << "MirSurfaceManager::onSessionCreatedSurface - mirSession=" << mirSession
                             << "surface=" << surface.get() << "surface.name=" << surface->name().c_str()

=== modified file 'src/modules/Unity/Application/mirsurfacemanager.h'
--- src/modules/Unity/Application/mirsurfacemanager.h	2016-05-06 08:28:44 +0000
+++ src/modules/Unity/Application/mirsurfacemanager.h	2016-06-06 19:34:22 +0000
@@ -75,7 +75,7 @@
     void onSessionCreatedSurface(const mir::scene::Session *,
                                  const std::shared_ptr<mir::scene::Surface> &,
                                  std::shared_ptr<SurfaceObserver> const&,
-                                 qtmir::CreationHints);
+                                 const qtmir::CreationHints &);
     void onSessionDestroyingSurface(const mir::scene::Session *, const std::shared_ptr<mir::scene::Surface> &);
 
 protected:

=== modified file 'src/modules/Unity/Application/proc_info.cpp'
--- src/modules/Unity/Application/proc_info.cpp	2015-10-08 11:20:30 +0000
+++ src/modules/Unity/Application/proc_info.cpp	2016-06-06 19:34:22 +0000
@@ -27,7 +27,7 @@
 }
 
 std::unique_ptr<ProcInfo::CommandLine> ProcInfo::commandLine(pid_t pid) {
-    QFile cmdline(QString("/proc/%1/cmdline").arg(pid));
+    QFile cmdline(QStringLiteral("/proc/%1/cmdline").arg(pid));
     if (!cmdline.open(QIODevice::ReadOnly | QIODevice::Text)) {
         return nullptr;
     }

=== modified file 'src/modules/Unity/Application/session.cpp'
--- src/modules/Unity/Application/session.cpp	2016-05-17 19:18:44 +0000
+++ src/modules/Unity/Application/session.cpp	2016-06-06 19:34:22 +0000
@@ -38,6 +38,8 @@
 
 using unity::shell::application::ApplicationInfoInterface;
 
+#define DEBUG_MSG qCDebug(QTMIR_SURFACES).nospace() << "Session[" << (void*)this << ",name=" << name() << "]::" << __func__
+
 namespace qtmir
 {
 
@@ -75,7 +77,7 @@
     , m_live(true)
     , m_promptSessionManager(promptSessionManager)
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::Session() " << this->name();
+    DEBUG_MSG << "()";
 
     setSuspendTimer(new Timer);
 
@@ -84,10 +86,10 @@
 
 Session::~Session()
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::~Session() " << name();
+    DEBUG_MSG << "()";
     stopPromptSessions();
 
-    QList<SessionInterface*> children(m_children->list());
+    const QList<SessionInterface*> children(m_children->list());
     for (SessionInterface* child : children) {
         delete child;
     }
@@ -107,7 +109,7 @@
     Q_ASSERT(m_state == Session::Suspending);
 
     if (m_surfaceList.count() == 0) {
-        qCDebug(QTMIR_SESSIONS) << "Application::suspend - no surface to call stopFrameDropper() on!";
+        DEBUG_MSG << " no surface to call stopFrameDropper() on!";
     } else {
         for (int i = 0; i < m_surfaceList.count(); ++i) {
             auto surface = static_cast<MirSurfaceInterface*>(m_surfaceList.get(i));
@@ -153,8 +155,7 @@
         return;
     }
 
-    qCDebug(QTMIR_SESSIONS) << "Session::setState - session=" << name()
-                            << "state=" << sessionStateToString(state);
+    DEBUG_MSG << "(state=" << sessionStateToString(state) << ")";
 
     if (m_state == Suspending) {
         m_suspendTimer->stop();
@@ -198,7 +199,7 @@
 
 void Session::registerSurface(MirSurfaceInterface *newSurface)
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::resgisterSurface - session=" << name() << "surface=" << newSurface;
+    DEBUG_MSG << "(surface=" << newSurface << ")";
 
     // Only notify QML of surface creation once it has drawn its first frame.
     if (newSurface->isFirstFrameDrawn()) {
@@ -214,7 +215,7 @@
 
 void Session::prependSurface(MirSurfaceInterface *newSurface)
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::prependSurface - session=" << name() << "surface=" << newSurface;
+    DEBUG_MSG << "(surface=" << newSurface << ")";
 
     connect(newSurface, &MirSurfaceInterface::stateChanged,
         this, &Session::updateFullscreenProperty);
@@ -246,7 +247,7 @@
 
 void Session::removeSurface(MirSurfaceInterface* surface)
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::removeSurface - session=" << name() << "surface=" << surface;
+    DEBUG_MSG << "(surface=" << surface << ")";
 
     surface->disconnect(this);
 
@@ -277,8 +278,8 @@
 
 void Session::setFullscreen(bool fullscreen)
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::setFullscreen - session=" << this << "fullscreen=" << fullscreen;
     if (m_fullscreen != fullscreen) {
+        DEBUG_MSG << "(" << fullscreen << ")";
         m_fullscreen = fullscreen;
         Q_EMIT fullscreenChanged(m_fullscreen);
     }
@@ -286,7 +287,7 @@
 
 void Session::suspend()
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::suspend - session=" << this << "state=" << sessionStateToString(m_state);
+    DEBUG_MSG << " state=" << sessionStateToString(m_state);
     if (m_state == Running) {
         session()->set_lifecycle_state(mir_lifecycle_state_will_suspend);
         m_suspendTimer->start();
@@ -305,7 +306,7 @@
 
 void Session::resume()
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::resume - session=" << this << "state=" << sessionStateToString(m_state);
+    DEBUG_MSG << " state=" << sessionStateToString(m_state);
 
     if (m_state == Suspending || m_state == Suspended) {
         doResume();
@@ -336,7 +337,7 @@
 
 void Session::close()
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::close - " << name();
+    DEBUG_MSG << "()";
 
     if (m_state == Stopped) return;
 
@@ -348,7 +349,7 @@
 
 void Session::stop()
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::stop - " << name();
+    DEBUG_MSG << "()";
 
     if (m_state != Stopped) {
 
@@ -372,7 +373,7 @@
 void Session::setLive(const bool live)
 {
     if (m_live != live) {
-        qCDebug(QTMIR_SESSIONS) << "Session::setLive - " << name() << "live=" << live;
+        DEBUG_MSG << "(" << live << ")";
 
         m_live = live;
         Q_EMIT liveChanged(m_live);
@@ -396,7 +397,7 @@
 
 void Session::insertChildSession(uint index, SessionInterface* session)
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::insertChildSession - " << session->name() << " to " << name() << " @  " << index;
+    DEBUG_MSG << "(index=" << index << ", Session[" << (void*)session << ",name=" << session->name() << "])";
     Q_ASSERT(!m_children->contains(session));
 
     m_children->insert(index, session);
@@ -424,7 +425,7 @@
 
 void Session::removeChildSession(SessionInterface* session)
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::removeChildSession - " << session->name() << " from " << name();
+    DEBUG_MSG << "(Session[" << (void*)session << ",name=" << session->name() << "])";
 
     disconnect(session, 0, this, 0);
 
@@ -437,9 +438,9 @@
     deleteIfZombieAndEmpty();
 }
 
-void Session::foreachChildSession(std::function<void(SessionInterface* session)> f) const
+void Session::foreachChildSession(const std::function<void(SessionInterface* session)>& f) const
 {
-    QList<SessionInterface*> children(m_children->list());
+    const QList<SessionInterface*> children(m_children->list());
     for (SessionInterface* child : children) {
         f(child);
     }
@@ -452,32 +453,30 @@
 
 void Session::appendPromptSession(const std::shared_ptr<ms::PromptSession>& promptSession)
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::appendPromptSession session=" << name()
-            << "promptSession=" << (promptSession ? promptSession.get() : nullptr);
+    DEBUG_MSG << "(promptSession=" << (promptSession ? promptSession.get() : nullptr) << ")";
 
     m_promptSessions.append(promptSession);
 }
 
 void Session::removePromptSession(const std::shared_ptr<ms::PromptSession>& promptSession)
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::removePromptSession session=" << name()
-            << "promptSession=" << (promptSession ? promptSession.get() : nullptr);
+    DEBUG_MSG << "(promptSession=" << (promptSession ? promptSession.get() : nullptr) << ")";
 
     m_promptSessions.removeAll(promptSession);
 }
 
 void Session::stopPromptSessions()
 {
-    QList<SessionInterface*> children(m_children->list());
+    const QList<SessionInterface*> children(m_children->list());
     for (SessionInterface* child : children) {
         static_cast<Session*>(child)->stopPromptSessions();
     }
 
-    QList<std::shared_ptr<ms::PromptSession>> copy(m_promptSessions);
-    QListIterator<std::shared_ptr<ms::PromptSession>> it(copy);
+    QVector<std::shared_ptr<ms::PromptSession>> copy(m_promptSessions);
+    QVectorIterator<std::shared_ptr<ms::PromptSession>> it(copy);
     for ( it.toBack(); it.hasPrevious(); ) {
         std::shared_ptr<ms::PromptSession> promptSession = it.previous();
-        qCDebug(QTMIR_SESSIONS) << "Session::stopPromptSessions - promptSession=" << promptSession.get();
+        DEBUG_MSG << " - promptSession=" << promptSession.get();
 
         m_promptSessionManager->stop_prompt_session(promptSession);
     }
@@ -490,9 +489,9 @@
     return nullptr;
 }
 
-void Session::foreachPromptSession(std::function<void(const std::shared_ptr<ms::PromptSession>&)> f) const
+void Session::foreachPromptSession(const std::function<void(const std::shared_ptr<ms::PromptSession>&)>& f) const
 {
-    for (std::shared_ptr<ms::PromptSession> promptSession : m_promptSessions) {
+    Q_FOREACH (std::shared_ptr<ms::PromptSession> promptSession, m_promptSessions) {
         f(promptSession);
     }
 }
@@ -500,7 +499,7 @@
 void Session::deleteIfZombieAndEmpty()
 {
     if (!m_live && m_children->rowCount() == 0 && m_surfaceList.isEmpty()) {
-        qCDebug(QTMIR_SESSIONS).nospace() << "Session::deleteIfZombieAndEmpty[" << name() << "] - deleteLater()";
+        DEBUG_MSG << " - deleteLater()";
         deleteLater();
     }
 }

=== modified file 'src/modules/Unity/Application/session.h'
--- src/modules/Unity/Application/session.h	2016-05-17 19:18:44 +0000
+++ src/modules/Unity/Application/session.h	2016-06-06 19:34:22 +0000
@@ -70,12 +70,12 @@
     void addChildSession(SessionInterface* session) override;
     void insertChildSession(uint index, SessionInterface* session) override;
     void removeChildSession(SessionInterface* session) override;
-    void foreachChildSession(std::function<void(SessionInterface* session)> f) const override;
+    void foreachChildSession(const std::function<void(SessionInterface* session)> &f) const override;
 
     std::shared_ptr<mir::scene::Session> session() const override;
 
     std::shared_ptr<mir::scene::PromptSession> activePromptSession() const override;
-    void foreachPromptSession(std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)> f) const override;
+    void foreachPromptSession(const std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)> &f) const override;
 
     SessionModel* childSessions() const override;
 
@@ -115,7 +115,7 @@
     State m_state;
     bool m_live;
     AbstractTimer* m_suspendTimer{nullptr};
-    QList<std::shared_ptr<mir::scene::PromptSession>> m_promptSessions;
+    QVector<std::shared_ptr<mir::scene::PromptSession>> m_promptSessions;
     std::shared_ptr<mir::scene::PromptSessionManager> const m_promptSessionManager;
     QList<MirSurfaceInterface*> m_closingSurfaces;
     bool m_hadSurface{false};

=== modified file 'src/modules/Unity/Application/session_interface.h'
--- src/modules/Unity/Application/session_interface.h	2016-05-17 19:18:44 +0000
+++ src/modules/Unity/Application/session_interface.h	2016-06-06 19:34:22 +0000
@@ -97,10 +97,10 @@
     virtual void addChildSession(SessionInterface* session) = 0;
     virtual void insertChildSession(uint index, SessionInterface* session) = 0;
     virtual void removeChildSession(SessionInterface* session) = 0;
-    virtual void foreachChildSession(std::function<void(SessionInterface* session)> f) const = 0;
+    virtual void foreachChildSession(const std::function<void(SessionInterface* session)>& f) const = 0;
 
     virtual std::shared_ptr<mir::scene::PromptSession> activePromptSession() const = 0;
-    virtual void foreachPromptSession(std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)> f) const = 0;
+    virtual void foreachPromptSession(const std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)>& f) const = 0;
 
     virtual void setFullscreen(bool fullscreen) = 0;
     virtual void setLive(const bool) = 0;

=== modified file 'src/modules/Unity/Application/sessionmanager.cpp'
--- src/modules/Unity/Application/sessionmanager.cpp	2016-05-06 08:41:15 +0000
+++ src/modules/Unity/Application/sessionmanager.cpp	2016-06-06 19:34:22 +0000
@@ -92,7 +92,7 @@
     , m_applicationManager(applicationManager)
 {
     qCDebug(QTMIR_SESSIONS) << "SessionManager::SessionManager - this=" << this;
-    setObjectName("qtmir::SessionManager");
+    setObjectName(QStringLiteral("qtmir::SessionManager"));
 }
 
 SessionManager::~SessionManager()

=== modified file 'src/modules/Unity/Application/sessionmanager.h'
--- src/modules/Unity/Application/sessionmanager.h	2015-08-11 12:08:32 +0000
+++ src/modules/Unity/Application/sessionmanager.h	2016-06-06 19:34:22 +0000
@@ -81,7 +81,6 @@
     ApplicationManager* m_applicationManager;
     static SessionManager *the_session_manager;
 
-    QList<Session*> m_sessions;
     QHash<const mir::scene::PromptSession *, SessionInterface *> m_mirPromptToSessionHash;
 };
 

=== modified file 'src/modules/Unity/Application/sharedwakelock.cpp'
--- src/modules/Unity/Application/sharedwakelock.cpp	2015-03-05 23:40:52 +0000
+++ src/modules/Unity/Application/sharedwakelock.cpp	2016-06-06 19:34:22 +0000
@@ -37,7 +37,7 @@
     Q_OBJECT
 public:
     Wakelock(const QDBusConnection &connection) noexcept
-        : AbstractDBusServiceMonitor("com.canonical.powerd", "/com/canonical/powerd", "com.canonical.powerd", connection)
+        : AbstractDBusServiceMonitor(QStringLiteral("com.canonical.powerd"), QStringLiteral("/com/canonical/powerd"), QStringLiteral("com.canonical.powerd"), connection)
         , m_wakelockEnabled(false)
     {
         // (re-)acquire wake lock when powerd (re-)appears on the bus
@@ -90,7 +90,7 @@
         }
 
         if (!m_cookie.isEmpty()) {
-            dbusInterface()->asyncCall("clearSysState", QString(m_cookie));
+            dbusInterface()->asyncCall(QStringLiteral("clearSysState"), QString(m_cookie));
             qCDebug(QTMIR_SESSIONS) << "Wakelock released" << m_cookie;
             m_cookie.clear();
         }
@@ -132,7 +132,7 @@
 
         if (!m_wakelockEnabled || !m_cookie.isEmpty()) {
             // notified wakelock was created, but we either don't want it, or already have one - release it immediately
-            dbusInterface()->asyncCall("clearSysState", QString(cookie));
+            dbusInterface()->asyncCall(QStringLiteral("clearSysState"), QString(cookie));
             return;
         }
 
@@ -155,7 +155,7 @@
             return;
         }
 
-        QDBusPendingCall pcall = dbusInterface()->asyncCall("requestSysState", "active", POWERD_SYS_STATE_ACTIVE);
+        QDBusPendingCall pcall = dbusInterface()->asyncCall(QStringLiteral("requestSysState"), "active", POWERD_SYS_STATE_ACTIVE);
 
         QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall, this);
         QObject::connect(watcher, &QDBusPendingCallWatcher::finished,

=== modified file 'src/modules/Unity/Application/ubuntukeyboardinfo.cpp'
--- src/modules/Unity/Application/ubuntukeyboardinfo.cpp	2015-08-11 12:08:32 +0000
+++ src/modules/Unity/Application/ubuntukeyboardinfo.cpp	2016-06-06 19:34:22 +0000
@@ -36,6 +36,8 @@
 UbuntuKeyboardInfo::UbuntuKeyboardInfo(QObject *parent)
     : QObject(parent),
     m_consecutiveAttempts(0),
+    m_lastX(0),
+    m_lastY(0),
     m_lastWidth(0),
     m_lastHeight(0)
 {
@@ -164,7 +166,7 @@
     if (xdgRuntimeDir) {
         m_socketFilePath = QDir(xdgRuntimeDir).filePath(gServerName);
     } else {
-        m_socketFilePath = QDir("/tmp").filePath(gServerName);
+        m_socketFilePath = QDir(QStringLiteral("/tmp")).filePath(gServerName);
     }
 }
 

=== modified file 'src/modules/Unity/Application/upstart/taskcontroller.cpp'
--- src/modules/Unity/Application/upstart/taskcontroller.cpp	2016-05-04 16:35:50 +0000
+++ src/modules/Unity/Application/upstart/taskcontroller.cpp	2016-06-06 19:34:22 +0000
@@ -59,7 +59,7 @@
     gchar *package, *application;
     if (ubuntu_app_launch_app_id_parse(appId.toLatin1().constData(), &package, &application, nullptr)) {
         // is long appId, so assemble its short appId
-        QString shortAppId = QString("%1_%2").arg(package).arg(application);
+        QString shortAppId = QStringLiteral("%1_%2").arg(package, application);
         g_free(package);
         g_free(application);
         return shortAppId;
@@ -127,8 +127,8 @@
         TaskController::Error error;
         switch(failureType)
         {
-        case UBUNTU_APP_LAUNCH_APP_FAILED_CRASH: error = TaskController::Error::APPLICATION_CRASHED;
-        case UBUNTU_APP_LAUNCH_APP_FAILED_START_FAILURE: error = TaskController::Error::APPLICATION_FAILED_TO_START;
+        case UBUNTU_APP_LAUNCH_APP_FAILED_CRASH: error = TaskController::Error::APPLICATION_CRASHED;                    break;
+        case UBUNTU_APP_LAUNCH_APP_FAILED_START_FAILURE: error = TaskController::Error::APPLICATION_FAILED_TO_START;    break;
         }
 
         auto thiz = static_cast<TaskController*>(userData);

=== modified file 'src/modules/Unity/Screens/CMakeLists.txt'
--- src/modules/Unity/Screens/CMakeLists.txt	2016-01-28 22:33:35 +0000
+++ src/modules/Unity/Screens/CMakeLists.txt	2016-06-06 19:34:22 +0000
@@ -1,5 +1,9 @@
 include_directories(
     ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
+)
+
+include_directories(
+    SYSTEM
     ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
     ${Qt5Quick_INCLUDE_DIRS}
     ${MIRSERVER_INCLUDE_DIRS}

=== modified file 'src/modules/Unity/Screens/qquickscreenwindow.cpp'
--- src/modules/Unity/Screens/qquickscreenwindow.cpp	2016-04-22 18:01:05 +0000
+++ src/modules/Unity/Screens/qquickscreenwindow.cpp	2016-06-06 19:34:22 +0000
@@ -50,7 +50,7 @@
     , m_scale(-1.0) // start with invalid initial state, fetch correct value on first invokation
     , m_formFactor(Screens::FormFactorUnknown)
 {
-    if (qGuiApp->platformName() == "mirserver") {
+    if (qGuiApp->platformName() == QLatin1String("mirserver")) {
         connect(qGuiApp->platformNativeInterface(), &QPlatformNativeInterface::windowPropertyChanged,
                 this, &QQuickScreenWindow::nativePropertyChanged);
         //m_scale = getScaleNativeProperty(); DO NOT CALL HERE - see note above

=== modified file 'src/platforms/mirserver/CMakeLists.txt'
--- src/platforms/mirserver/CMakeLists.txt	2016-05-25 13:54:30 +0000
+++ src/platforms/mirserver/CMakeLists.txt	2016-06-06 19:34:22 +0000
@@ -26,6 +26,10 @@
 include_directories(
     ${CMAKE_SOURCE_DIR}/src/common
 
+)
+
+include_directories(
+  SYSTEM
     ${MIRCOMMON_INCLUDE_DIRS}
     ${MIRSERVER_INCLUDE_DIRS}
     ${MIRRENDERERGLDEV_INCLUDE_DIRS}
@@ -82,6 +86,7 @@
     tracepoints.c
 # We need to run moc on these headers
     ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h
+    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirMousePointerInterface.h
     )
 
 add_library(qpa-mirserver SHARED

=== modified file 'src/platforms/mirserver/clipboard.cpp'
--- src/platforms/mirserver/clipboard.cpp	2016-05-03 19:45:51 +0000
+++ src/platforms/mirserver/clipboard.cpp	2016-06-06 19:34:22 +0000
@@ -65,12 +65,13 @@
         int offset = headerSize;
         header[0] = formatCount;
         for (int i = 0; i < formatCount; i++) {
+            const QByteArray data = mimeData->data(formats[i]);
             const int formatOffset = offset;
             const int formatSize = formats[i].size();
             const int dataOffset = offset + formatSize;
-            const int dataSize = mimeData->data(formats[i]).size();
+            const int dataSize = data.size();
             memcpy(&buffer[formatOffset], formats[i].toLatin1().data(), formatSize);
-            memcpy(&buffer[dataOffset], mimeData->data(formats[i]).data(), dataSize);
+            memcpy(&buffer[dataOffset], data.data(), dataSize);
             header[i*4+1] = formatOffset;
             header[i*4+2] = formatSize;
             header[i*4+3] = dataOffset;

=== modified file 'src/platforms/mirserver/creationhints.cpp'
--- src/platforms/mirserver/creationhints.cpp	2016-03-18 12:15:54 +0000
+++ src/platforms/mirserver/creationhints.cpp	2016-06-06 19:34:22 +0000
@@ -56,7 +56,7 @@
 
 QString CreationHints::toString() const
 {
-    return QString("CreationHints(minW=%1,minH=%2,maxW=%3,maxH=%4,wIncr=%5,hInc=%6,shellChrome=%7)")
+    return QStringLiteral("CreationHints(minW=%1,minH=%2,maxW=%3,maxH=%4,wIncr=%5,hInc=%6,shellChrome=%7)")
         .arg(minWidth)
         .arg(minHeight)
         .arg(maxWidth)

=== modified file 'src/platforms/mirserver/creationhints.h'
--- src/platforms/mirserver/creationhints.h	2016-03-10 11:55:28 +0000
+++ src/platforms/mirserver/creationhints.h	2016-06-06 19:34:22 +0000
@@ -24,7 +24,7 @@
 
 namespace mir {
     namespace scene {
-        class SurfaceCreationParameters;
+        struct SurfaceCreationParameters;
     }
 }
 

=== modified file 'src/platforms/mirserver/cursor.cpp'
--- src/platforms/mirserver/cursor.cpp	2015-11-25 15:38:50 +0000
+++ src/platforms/mirserver/cursor.cpp	2016-06-06 19:34:22 +0000
@@ -27,28 +27,28 @@
 
 Cursor::Cursor()
 {
-    m_shapeToCursorName[Qt::ArrowCursor] = "left_ptr";
-    m_shapeToCursorName[Qt::UpArrowCursor] = "up_arrow";
-    m_shapeToCursorName[Qt::CrossCursor] = "cross";
-    m_shapeToCursorName[Qt::WaitCursor] = "watch";
-    m_shapeToCursorName[Qt::IBeamCursor] = "xterm";
-    m_shapeToCursorName[Qt::SizeVerCursor] = "size_ver";
-    m_shapeToCursorName[Qt::SizeHorCursor] = "size_hor";
-    m_shapeToCursorName[Qt::SizeBDiagCursor] = "size_bdiag";
-    m_shapeToCursorName[Qt::SizeFDiagCursor] = "size_fdiag";
-    m_shapeToCursorName[Qt::SizeAllCursor] = "size_all";
-    m_shapeToCursorName[Qt::BlankCursor] = "blank";
-    m_shapeToCursorName[Qt::SplitVCursor] = "split_v";
-    m_shapeToCursorName[Qt::SplitHCursor] = "split_h";
-    m_shapeToCursorName[Qt::PointingHandCursor] = "hand";
-    m_shapeToCursorName[Qt::ForbiddenCursor] = "forbidden";
-    m_shapeToCursorName[Qt::WhatsThisCursor] = "whats_this";
-    m_shapeToCursorName[Qt::BusyCursor] = "left_ptr_watch";
-    m_shapeToCursorName[Qt::OpenHandCursor] = "openhand";
-    m_shapeToCursorName[Qt::ClosedHandCursor] = "closedhand";
-    m_shapeToCursorName[Qt::DragCopyCursor] = "dnd-copy";
-    m_shapeToCursorName[Qt::DragMoveCursor] = "dnd-move";
-    m_shapeToCursorName[Qt::DragLinkCursor] = "dnd-link";
+    m_shapeToCursorName[Qt::ArrowCursor] = QStringLiteral("left_ptr");
+    m_shapeToCursorName[Qt::UpArrowCursor] = QStringLiteral("up_arrow");
+    m_shapeToCursorName[Qt::CrossCursor] = QStringLiteral("cross");
+    m_shapeToCursorName[Qt::WaitCursor] = QStringLiteral("watch");
+    m_shapeToCursorName[Qt::IBeamCursor] = QStringLiteral("xterm");
+    m_shapeToCursorName[Qt::SizeVerCursor] = QStringLiteral("size_ver");
+    m_shapeToCursorName[Qt::SizeHorCursor] = QStringLiteral("size_hor");
+    m_shapeToCursorName[Qt::SizeBDiagCursor] = QStringLiteral("size_bdiag");
+    m_shapeToCursorName[Qt::SizeFDiagCursor] = QStringLiteral("size_fdiag");
+    m_shapeToCursorName[Qt::SizeAllCursor] = QStringLiteral("size_all");
+    m_shapeToCursorName[Qt::BlankCursor] = QStringLiteral("blank");
+    m_shapeToCursorName[Qt::SplitVCursor] = QStringLiteral("split_v");
+    m_shapeToCursorName[Qt::SplitHCursor] = QStringLiteral("split_h");
+    m_shapeToCursorName[Qt::PointingHandCursor] = QStringLiteral("hand");
+    m_shapeToCursorName[Qt::ForbiddenCursor] = QStringLiteral("forbidden");
+    m_shapeToCursorName[Qt::WhatsThisCursor] = QStringLiteral("whats_this");
+    m_shapeToCursorName[Qt::BusyCursor] = QStringLiteral("left_ptr_watch");
+    m_shapeToCursorName[Qt::OpenHandCursor] = QStringLiteral("openhand");
+    m_shapeToCursorName[Qt::ClosedHandCursor] = QStringLiteral("closedhand");
+    m_shapeToCursorName[Qt::DragCopyCursor] = QStringLiteral("dnd-copy");
+    m_shapeToCursorName[Qt::DragMoveCursor] = QStringLiteral("dnd-move");
+    m_shapeToCursorName[Qt::DragLinkCursor] = QStringLiteral("dnd-link");
 
     connect(Mir::instance(), &Mir::cursorNameChanged, this, &Cursor::setMirCursorName);
 }
@@ -61,10 +61,10 @@
 
     if (windowCursor) {
         if (windowCursor->pixmap().isNull()) {
-            m_qtCursorName = m_shapeToCursorName.value(windowCursor->shape(), QLatin1String("left_ptr"));
+            m_qtCursorName = m_shapeToCursorName.value(windowCursor->shape(), QStringLiteral("left_ptr"));
             m_mousePointer->setCustomCursor(QCursor());
         } else {
-            m_qtCursorName = QLatin1String("custom");
+            m_qtCursorName = QStringLiteral("custom");
             m_mousePointer->setCustomCursor(*windowCursor);
         }
     } else {
@@ -170,7 +170,7 @@
 
     if (m_mirCursorName.isEmpty()) {
         if (m_qtCursorName.isEmpty()) {
-            m_mousePointer->setCursorName("left_ptr");
+            m_mousePointer->setCursorName(QStringLiteral("left_ptr"));
         } else {
             m_mousePointer->setCursorName(m_qtCursorName);
         }

=== modified file 'src/platforms/mirserver/cursor.h'
--- src/platforms/mirserver/cursor.h	2015-11-19 14:17:54 +0000
+++ src/platforms/mirserver/cursor.h	2016-06-06 19:34:22 +0000
@@ -28,6 +28,7 @@
 
 class Cursor : public MirPlatformCursor
 {
+    Q_OBJECT
 public:
     Cursor();
 

=== modified file 'src/platforms/mirserver/mircursorimages.cpp'
--- src/platforms/mirserver/mircursorimages.cpp	2015-11-10 11:07:23 +0000
+++ src/platforms/mirserver/mircursorimages.cpp	2016-06-06 19:34:22 +0000
@@ -20,7 +20,7 @@
 using namespace qtmir;
 
 std::shared_ptr<mir::graphics::CursorImage> MirCursorImages::image(const std::string &cursor_name,
-        const mir::geometry::Size&)
+        const mir::geometry::Size &)
 {
     // We are not responsible for loading cursors. This is left for shell to do as it's drawing its own QML cursor.
     // So here we work around Mir API by storing just the cursor name in the CursorImage.

=== modified file 'src/platforms/mirserver/mirwindowmanager.cpp'
--- src/platforms/mirserver/mirwindowmanager.cpp	2016-04-28 12:48:48 +0000
+++ src/platforms/mirserver/mirwindowmanager.cpp	2016-06-06 19:34:22 +0000
@@ -196,7 +196,7 @@
                                           const std::shared_ptr<mir::scene::Surface>& surface,
                                           const mir::shell::SurfaceSpecification& modifications)
 {
-    QMutexLocker(&SurfaceObserver::mutex);
+    QMutexLocker locker(&SurfaceObserver::mutex);
     SurfaceObserver *observer = SurfaceObserver::observerForSurface(surface.get());
     if (observer) {
         observer->notifySurfaceModifications(modifications);

=== modified file 'src/platforms/mirserver/nativeinterface.cpp'
--- src/platforms/mirserver/nativeinterface.cpp	2016-05-05 14:17:14 +0000
+++ src/platforms/mirserver/nativeinterface.cpp	2016-06-06 19:34:22 +0000
@@ -56,8 +56,8 @@
     auto w = static_cast<ScreenWindow*>(window);
     auto s = static_cast<Screen*>(w->screen());
     if (s) {
-        propertyMap.insert("scale", s->scale());
-        propertyMap.insert("formFactor", s->formFactor());
+        propertyMap.insert(QStringLiteral("scale"), s->scale());
+        propertyMap.insert(QStringLiteral("formFactor"), s->formFactor());
     }
     return propertyMap;
 }

=== modified file 'src/platforms/mirserver/nativeinterface.h'
--- src/platforms/mirserver/nativeinterface.h	2016-05-05 14:17:14 +0000
+++ src/platforms/mirserver/nativeinterface.h	2016-06-06 19:34:22 +0000
@@ -27,10 +27,11 @@
 
 class NativeInterface : public QPlatformNativeInterface
 {
+    Q_OBJECT
 public:
     NativeInterface(QMirServer *);
 
-    virtual void *nativeResourceForIntegration(const QByteArray &resource);
+    void *nativeResourceForIntegration(const QByteArray &resource) override;
 
     QVariantMap windowProperties(QPlatformWindow *window) const override;
     QVariant windowProperty(QPlatformWindow *window, const QString &name) const override;

=== modified file 'src/platforms/mirserver/plugin.cpp'
--- src/platforms/mirserver/plugin.cpp	2015-10-19 21:17:18 +0000
+++ src/platforms/mirserver/plugin.cpp	2016-06-06 19:34:22 +0000
@@ -20,7 +20,7 @@
 QPlatformIntegration *MirServerIntegrationPlugin::create(const QString &system, const QStringList &/*paramList*/,
                                                          int &argc, char **argv)
 {
-    if (system.toLower() == "mirserver")
+    if (system.toLower() == QLatin1String("mirserver"))
         return new MirServerIntegration(argc, argv);
     return 0;
 }

=== modified file 'src/platforms/mirserver/qteventfeeder.cpp'
--- src/platforms/mirserver/qteventfeeder.cpp	2016-05-06 08:41:15 +0000
+++ src/platforms/mirserver/qteventfeeder.cpp	2016-06-06 19:34:22 +0000
@@ -852,7 +852,7 @@
             result.append(",");
         }
         const struct QWindowSystemInterface::TouchPoint &point = points.at(i);
-        result.append(QString("(id=%1,state=%2,normalPosition=(%3,%4))")
+        result.append(QStringLiteral("(id=%1,state=%2,normalPosition=(%3,%4))")
             .arg(point.id)
             .arg(touchPointStateToString(point.state))
             .arg(point.normalPosition.x())

=== modified file 'src/platforms/mirserver/screen.cpp'
--- src/platforms/mirserver/screen.cpp	2016-05-06 08:41:15 +0000
+++ src/platforms/mirserver/screen.cpp	2016-06-06 19:34:22 +0000
@@ -169,15 +169,15 @@
 
     if (!skipDBusRegistration) {
         // FIXME This is a unity8 specific dbus call and shouldn't be in qtmir
-        m_unityScreen = new QDBusInterface("com.canonical.Unity.Screen",
-                                         "/com/canonical/Unity/Screen",
-                                         "com.canonical.Unity.Screen",
+        m_unityScreen = new QDBusInterface(QStringLiteral("com.canonical.Unity.Screen"),
+                                         QStringLiteral("/com/canonical/Unity/Screen"),
+                                         QStringLiteral("com.canonical.Unity.Screen"),
                                          QDBusConnection::systemBus(), this);
 
-        m_unityScreen->connection().connect("com.canonical.Unity.Screen",
-                                          "/com/canonical/Unity/Screen",
-                                          "com.canonical.Unity.Screen",
-                                          "DisplayPowerStateChange",
+        m_unityScreen->connection().connect(QStringLiteral("com.canonical.Unity.Screen"),
+                                          QStringLiteral("/com/canonical/Unity/Screen"),
+                                          QStringLiteral("com.canonical.Unity.Screen"),
+                                          QStringLiteral("DisplayPowerStateChange"),
                                           this,
                                           SLOT(onDisplayPowerStateChanged(int, int)));
     }

=== modified file 'src/platforms/mirserver/screenscontroller.cpp'
--- src/platforms/mirserver/screenscontroller.cpp	2016-01-29 16:49:06 +0000
+++ src/platforms/mirserver/screenscontroller.cpp	2016-06-06 19:34:22 +0000
@@ -54,13 +54,13 @@
     return list;
 }
 
-bool ScreensController::setConfiguration(CustomScreenConfigurationList newConfig)
+bool ScreensController::setConfiguration(const CustomScreenConfigurationList &newConfig)
 {
     using namespace mir::geometry;
 
     auto displayConfiguration = m_display->configuration();
 
-    Q_FOREACH (auto config, newConfig) {
+    Q_FOREACH (const auto &config, newConfig) {
         displayConfiguration->for_each_output(
             [&config](mg::UserDisplayConfigurationOutput &outputConfig)
             {

=== modified file 'src/platforms/mirserver/screenscontroller.h'
--- src/platforms/mirserver/screenscontroller.h	2016-01-29 16:49:06 +0000
+++ src/platforms/mirserver/screenscontroller.h	2016-06-06 19:34:22 +0000
@@ -43,7 +43,7 @@
                                QObject *parent = 0);
 
     CustomScreenConfigurationList configuration();
-    bool setConfiguration(CustomScreenConfigurationList newConfig);
+    bool setConfiguration(const CustomScreenConfigurationList &newConfig);
 
 private:
     const QSharedPointer<ScreensModel> m_screensModel;

=== modified file 'src/platforms/mirserver/screensmodel.cpp'
--- src/platforms/mirserver/screensmodel.cpp	2016-05-06 08:41:15 +0000
+++ src/platforms/mirserver/screensmodel.cpp	2016-06-06 19:34:22 +0000
@@ -144,7 +144,7 @@
     );
 
     // Announce new Screens to Qt
-    for (auto screen : newScreenList) {
+    Q_FOREACH (auto screen, newScreenList) {
         Q_EMIT screenAdded(screen);
     }
 
@@ -157,7 +157,7 @@
     }
 
     // Delete any old & unused Screens
-    for (auto screen: oldScreenList) {
+    Q_FOREACH (auto screen, oldScreenList) {
         qCDebug(QTMIR_SCREENS) << "Removed Screen with id" << screen->m_outputId.as_value()
                                << "and geometry" << screen->geometry();
         auto window = static_cast<ScreenWindow *>(screen->window());
@@ -180,7 +180,7 @@
                          buffer.view_area().size.width.as_int(),
                          buffer.view_area().size.height.as_int());
 
-            for (auto screen : m_screenList) {
+            Q_FOREACH (auto screen, m_screenList) {
                 if (dbGeom == screen->geometry()) {
                     screen->setMirDisplayBuffer(&buffer, &group);
                     break;
@@ -190,7 +190,7 @@
     });
 
     qCDebug(QTMIR_SCREENS) << "=======================================";
-    for (auto screen: m_screenList) {
+    Q_FOREACH (auto screen, m_screenList) {
         qCDebug(QTMIR_SCREENS) << screen << "- id:" << screen->m_outputId.as_value()
                                << "geometry:" << screen->geometry()
                                << "window:" << screen->window()
@@ -217,7 +217,7 @@
 
 void ScreensModel::allWindowsSetExposed(bool exposed)
 {
-    for (const auto screen : m_screenList) {
+    Q_FOREACH (const auto screen, m_screenList) {
         const auto window = static_cast<ScreenWindow *>(screen->window());
         if (window && window->window()) {
             window->setExposed(exposed);
@@ -240,7 +240,7 @@
     return nullptr;
 }
 
-QWindow* ScreensModel::getWindowForPoint(const QPoint &point) //FIXME - not thread safe & not efficient
+QWindow* ScreensModel::getWindowForPoint(QPoint point) //FIXME - not thread safe & not efficient
 {
     // This is a part optimization, and a part work-around for AP generated input events occasionally
     // appearing outside the screen borders: https://bugs.launchpad.net/qtmir/+bug/1508415
@@ -248,7 +248,7 @@
         return m_screenList.first()->window()->window();
     }
 
-    for (Screen *screen : m_screenList) {
+    Q_FOREACH (Screen *screen, m_screenList) {
         if (screen->window() && screen->geometry().contains(point)) {
             return screen->window()->window();
         }

=== modified file 'src/platforms/mirserver/screensmodel.h'
--- src/platforms/mirserver/screensmodel.h	2016-04-29 15:41:00 +0000
+++ src/platforms/mirserver/screensmodel.h	2016-06-06 19:34:22 +0000
@@ -62,7 +62,7 @@
     QList<Screen*> screens() const { return m_screenList; }
     bool compositing() const { return m_compositing; }
 
-    QWindow* getWindowForPoint(const QPoint &point);
+    QWindow* getWindowForPoint(QPoint point);
 
 Q_SIGNALS:
     void screenAdded(Screen *screen);

=== modified file 'src/platforms/mirserver/sessionlistener.cpp'
--- src/platforms/mirserver/sessionlistener.cpp	2016-03-10 11:55:28 +0000
+++ src/platforms/mirserver/sessionlistener.cpp	2016-06-06 19:34:22 +0000
@@ -90,7 +90,7 @@
     Q_EMIT sessionDestroyingSurface(&session, surface);
 }
 
-void SessionListener::surfaceAboutToBeCreated(mir::scene::Session& session, qtmir::CreationHints creationHints)
+void SessionListener::surfaceAboutToBeCreated(mir::scene::Session& session, const qtmir::CreationHints &creationHints)
 {
     m_creationHintsForNewSurface[&session] = creationHints;
 }

=== modified file 'src/platforms/mirserver/sessionlistener.h'
--- src/platforms/mirserver/sessionlistener.h	2016-03-10 11:55:28 +0000
+++ src/platforms/mirserver/sessionlistener.h	2016-06-06 19:34:22 +0000
@@ -42,7 +42,7 @@
     void surface_created(mir::scene::Session&, std::shared_ptr<mir::scene::Surface> const&) override;
     void destroying_surface(mir::scene::Session&, std::shared_ptr<mir::scene::Surface> const&) override;
 
-    void surfaceAboutToBeCreated(mir::scene::Session&, qtmir::CreationHints creationHints);
+    void surfaceAboutToBeCreated(mir::scene::Session&, const qtmir::CreationHints &creationHints);
 
 Q_SIGNALS:
     void sessionStarting(std::shared_ptr<mir::scene::Session> const& session);

=== modified file 'src/platforms/mirserver/surfaceobserver.cpp'
--- src/platforms/mirserver/surfaceobserver.cpp	2016-05-05 14:18:30 +0000
+++ src/platforms/mirserver/surfaceobserver.cpp	2016-06-06 19:34:22 +0000
@@ -28,7 +28,7 @@
 #include <mir/geometry/size.h>
 #include <mir/shell/surface_specification.h>
 
-QMap<const mir::scene::Surface*, SurfaceObserver*> SurfaceObserver::m_surfaceToObserverMap;
+QHash<const mir::scene::Surface*, SurfaceObserver*> SurfaceObserver::m_surfaceToObserverMap;
 QMutex SurfaceObserver::mutex;
 
 SurfaceObserver::SurfaceObserver()
@@ -83,7 +83,7 @@
 SurfaceObserver::~SurfaceObserver()
 {
     QMutexLocker locker(&mutex);
-    QMutableMapIterator<const mir::scene::Surface*, SurfaceObserver*> i(m_surfaceToObserverMap);
+    QMutableHashIterator<const mir::scene::Surface*, SurfaceObserver*> i(m_surfaceToObserverMap);
     while (i.hasNext()) {
         i.next();
         if (i.value() == this) {

=== modified file 'src/platforms/mirserver/surfaceobserver.h'
--- src/platforms/mirserver/surfaceobserver.h	2016-05-05 14:17:14 +0000
+++ src/platforms/mirserver/surfaceobserver.h	2016-06-06 19:34:22 +0000
@@ -30,7 +30,7 @@
         class Surface;
     }
     namespace shell {
-        class SurfaceSpecification;
+        struct SurfaceSpecification;
     }
 }
 
@@ -90,7 +90,7 @@
     QObject *m_listener;
     bool m_framesPosted;
     QMap<QByteArray, Qt::CursorShape> m_cursorNameToShape;
-    static QMap<const mir::scene::Surface*, SurfaceObserver*> m_surfaceToObserverMap;
+    static QHash<const mir::scene::Surface*, SurfaceObserver*> m_surfaceToObserverMap;
 };
 
 #endif

=== modified file 'tests/framework/CMakeLists.txt'
--- tests/framework/CMakeLists.txt	2016-05-24 20:13:10 +0000
+++ tests/framework/CMakeLists.txt	2016-06-06 19:34:22 +0000
@@ -1,7 +1,11 @@
 include_directories(
-    ${APPLICATION_API_INCLUDE_DIRS}
     ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
     ${CMAKE_SOURCE_DIR}/src/modules
+)
+
+include_directories(
+    SYSTEM
+    ${APPLICATION_API_INCLUDE_DIRS}
     ${MIRSERVER_INCLUDE_DIRS}
     ${MIRRENDERERGLDEV_INCLUDE_DIRS}
 

=== modified file 'tests/framework/fake_session.cpp'
--- tests/framework/fake_session.cpp	2016-05-24 20:13:10 +0000
+++ tests/framework/fake_session.cpp	2016-06-06 19:34:22 +0000
@@ -92,14 +92,14 @@
 
 void FakeSession::removeChildSession(SessionInterface *) {}
 
-void FakeSession::foreachChildSession(std::function<void (SessionInterface *)>) const {}
+void FakeSession::foreachChildSession(const std::function<void (SessionInterface *)> &) const {}
 
 std::shared_ptr<mir::scene::PromptSession> FakeSession::activePromptSession() const
 {
     return std::shared_ptr<mir::scene::PromptSession>();
 }
 
-void FakeSession::foreachPromptSession(std::function<void (const std::shared_ptr<mir::scene::PromptSession> &)>) const {}
+void FakeSession::foreachPromptSession(const std::function<void (const std::shared_ptr<mir::scene::PromptSession> &)> &) const {}
 
 void FakeSession::setFullscreen(bool) {}
 

=== modified file 'tests/framework/fake_session.h'
--- tests/framework/fake_session.h	2016-05-24 20:13:10 +0000
+++ tests/framework/fake_session.h	2016-06-06 19:34:22 +0000
@@ -63,10 +63,10 @@
     void addChildSession(SessionInterface*) override;
     void insertChildSession(uint, SessionInterface*) override;
     void removeChildSession(SessionInterface*) override;
-    void foreachChildSession(std::function<void(SessionInterface* session)>) const override;
+    void foreachChildSession(const std::function<void(SessionInterface* session)> &) const override;
 
     std::shared_ptr<mir::scene::PromptSession> activePromptSession() const override;
-    void foreachPromptSession(std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)>) const override;
+    void foreachPromptSession(const std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)> &) const override;
 
     void setFullscreen(bool) override;
     void setLive(const bool) override;

=== modified file 'tests/framework/mock_mir_session.cpp'
--- tests/framework/mock_mir_session.cpp	2015-10-19 10:45:42 +0000
+++ tests/framework/mock_mir_session.cpp	2016-06-06 19:34:22 +0000
@@ -22,6 +22,7 @@
 {
 
 MockSession::MockSession()
+    : m_sessionId(-1)
 {
 }
 

=== modified file 'tests/framework/mock_session.h'
--- tests/framework/mock_session.h	2016-03-28 18:02:26 +0000
+++ tests/framework/mock_session.h	2016-06-06 19:34:22 +0000
@@ -57,10 +57,10 @@
     MOCK_METHOD1(addChildSession, void(SessionInterface* session));
     MOCK_METHOD2(insertChildSession, void(uint index, SessionInterface* session));
     MOCK_METHOD1(removeChildSession, void(SessionInterface* session));
-    MOCK_CONST_METHOD1(foreachChildSession, void(std::function<void(SessionInterface* session)> f));
+    MOCK_CONST_METHOD1(foreachChildSession, void(const std::function<void(SessionInterface* session)> &f));
 
     MOCK_CONST_METHOD0(activePromptSession, std::shared_ptr<mir::scene::PromptSession>());
-    MOCK_CONST_METHOD1(foreachPromptSession, void(std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)> f));
+    MOCK_CONST_METHOD1(foreachPromptSession, void(const std::function<void(const std::shared_ptr<mir::scene::PromptSession>&)> &f));
 
     void setState(State state);
 

=== modified file 'tests/mirserver/Clipboard/CMakeLists.txt'
--- tests/mirserver/Clipboard/CMakeLists.txt	2014-12-03 08:56:35 +0000
+++ tests/mirserver/Clipboard/CMakeLists.txt	2016-06-06 19:34:22 +0000
@@ -6,6 +6,10 @@
 
 include_directories(
   ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
+)
+
+include_directories(
+  SYSTEM
   ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
   ${MIRSERVER_INCLUDE_DIRS}
 )

=== modified file 'tests/mirserver/QtEventFeeder/CMakeLists.txt'
--- tests/mirserver/QtEventFeeder/CMakeLists.txt	2014-12-03 08:56:35 +0000
+++ tests/mirserver/QtEventFeeder/CMakeLists.txt	2016-06-06 19:34:22 +0000
@@ -7,6 +7,10 @@
 include_directories(
   ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
   ${CMAKE_SOURCE_DIR}/src/common
+)
+
+include_directories(
+  SYSTEM
   ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
   ${MIRSERVER_INCLUDE_DIRS}
 )

=== modified file 'tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h'
--- tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h	2016-01-07 11:37:55 +0000
+++ tests/mirserver/QtEventFeeder/mock_qtwindowsystem.h	2016-06-06 19:34:22 +0000
@@ -28,7 +28,6 @@
     MOCK_METHOD1(getWindowForTouchPoint, QWindow*(const QPoint &point));
     MOCK_METHOD0(lastWindow, QWindow*());
     MOCK_METHOD0(focusedWindow, QWindow*());
-    MOCK_METHOD1(registerTouchDevice, void(QTouchDevice* device));
 
     // Wanted to use GMock, but MOCK_METHOD11 not implemented
     void handleExtendedKeyEvent(QWindow */*window*/, ulong /*timestamp*/, QEvent::Type /*type*/, int /*key*/,
@@ -43,6 +42,18 @@
             Qt::KeyboardModifiers mods));
     MOCK_METHOD4(handleMouseEvent, void(ulong timestamp, QPointF point, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers));
     MOCK_METHOD3(handleWheelEvent, void(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers mods));
+
+    ~MockQtWindowSystem()
+    {
+        qDeleteAll(m_devices);
+    }
+
+    void registerTouchDevice(QTouchDevice* device)
+    {
+        m_devices << device;
+    }
+
+    QVector<QTouchDevice*> m_devices;
 };
 
 namespace testing

=== modified file 'tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp'
--- tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp	2016-04-29 15:41:00 +0000
+++ tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp	2016-06-06 19:34:22 +0000
@@ -78,11 +78,11 @@
     mockWindowSystem = new MockQtWindowSystem;
     auto screens = QSharedPointer<ScreensModel>();
 
-    EXPECT_CALL(*mockWindowSystem, registerTouchDevice(_));
+    ASSERT_TRUE(mockWindowSystem->m_devices.count() == 0);
 
     qtEventFeeder = new QtEventFeeder(screens, mockWindowSystem);
 
-    ASSERT_TRUE(Mock::VerifyAndClearExpectations(mockWindowSystem));
+    ASSERT_TRUE(mockWindowSystem->m_devices.count() == 1);
 
     int argc = 0;
     char **argv = nullptr;

=== modified file 'tests/mirserver/Screen/CMakeLists.txt'
--- tests/mirserver/Screen/CMakeLists.txt	2015-11-11 10:43:36 +0000
+++ tests/mirserver/Screen/CMakeLists.txt	2016-06-06 19:34:22 +0000
@@ -8,6 +8,10 @@
   ${CMAKE_SOURCE_DIR}/tests/framework
   ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
   ${CMAKE_SOURCE_DIR}/src/common
+)
+
+include_directories(
+  SYSTEM
   ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
   ${MIRSERVER_INCLUDE_DIRS}
 )

=== modified file 'tests/mirserver/ScreensModel/CMakeLists.txt'
--- tests/mirserver/ScreensModel/CMakeLists.txt	2016-02-16 11:48:35 +0000
+++ tests/mirserver/ScreensModel/CMakeLists.txt	2016-06-06 19:34:22 +0000
@@ -11,6 +11,10 @@
   ${CMAKE_SOURCE_DIR}/tests/framework
   ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
   ${CMAKE_SOURCE_DIR}/src/common
+)
+
+include_directories(
+  SYSTEM
   ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
   ${MIRSERVER_INCLUDE_DIRS}
   ${MIRRENDERERGLDEV_INCLUDE_DIRS}

=== modified file 'tests/mirserver/ScreensModel/screensmodel_test.cpp'
--- tests/mirserver/ScreensModel/screensmodel_test.cpp	2016-04-29 15:41:00 +0000
+++ tests/mirserver/ScreensModel/screensmodel_test.cpp	2016-06-06 19:34:22 +0000
@@ -64,6 +64,7 @@
 void ScreensModelTest::TearDown()
 {
     delete screensModel;
+    delete app;
 }
 
 TEST_F(ScreensModelTest, SingleScreenFound)

=== modified file 'tests/mirserver/WindowManager/CMakeLists.txt'
--- tests/mirserver/WindowManager/CMakeLists.txt	2016-03-10 11:55:28 +0000
+++ tests/mirserver/WindowManager/CMakeLists.txt	2016-06-06 19:34:22 +0000
@@ -1,5 +1,9 @@
 include_directories(
   ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
+)
+
+include_directories(
+  SYSTEM
   ${MIRSERVER_INCLUDE_DIRS}
 )
 

=== modified file 'tests/modules/Application/CMakeLists.txt'
--- tests/modules/Application/CMakeLists.txt	2015-12-15 10:03:32 +0000
+++ tests/modules/Application/CMakeLists.txt	2016-06-06 19:34:22 +0000
@@ -7,8 +7,11 @@
   ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
   ${CMAKE_SOURCE_DIR}/src/modules
   ${CMAKE_SOURCE_DIR}/tests/framework
+)
+
+include_directories(
+  SYSTEM
   ${MIRSERVER_INCLUDE_DIRS}
-
   ${Qt5Core_INCLUDE_DIRS}
   ${Qt5GUI_INCLUDE_DIRS}
   ${Qt5Quick_INCLUDE_DIRS}

=== modified file 'tests/modules/Application/application_test.cpp'
--- tests/modules/Application/application_test.cpp	2016-05-02 12:57:40 +0000
+++ tests/modules/Application/application_test.cpp	2016-06-06 19:34:22 +0000
@@ -590,6 +590,38 @@
     EXPECT_EQ(Application::InternalState::StoppedResumable, application->internalState());
 }
 
+TEST_F(ApplicationTests, surfaceCountPropertyUpdates)
+{
+    using namespace ::testing;
+
+    QScopedPointer<Application> application(createApplicationWithFakes());
+
+    application->setProcessState(Application::ProcessRunning);
+    Session *session = createSessionWithFakes();
+
+    application->setSession(session);
+
+    QSignalSpy surfaceCountChangedSpy(application.data(), &Application::surfaceCountChanged);
+
+    EXPECT_EQ(application->surfaceCount(), 0);
+    EXPECT_EQ(surfaceCountChangedSpy.count(), 0);
+
+    FakeMirSurface *surface = new FakeMirSurface;
+    session->registerSurface(surface);
+    surface->drawFirstFrame();
+
+    EXPECT_EQ(application->surfaceCount(), 1);
+    EXPECT_EQ(surfaceCountChangedSpy.count(), 1);
+
+    FakeMirSurface *surface2 = new FakeMirSurface;
+    session->registerSurface(surface2);
+    surface2->drawFirstFrame();
+
+    EXPECT_EQ(application->surfaceCount(), 2);
+    EXPECT_EQ(surfaceCountChangedSpy.count(), 2);
+
+}
+
 /*
    Regression test for bug "App respawns if manually closed while it's launching"
    https://bugs.launchpad.net/ubuntu/+source/qtmir/+bug/1575577

=== modified file 'tests/modules/ApplicationManager/CMakeLists.txt'
--- tests/modules/ApplicationManager/CMakeLists.txt	2015-09-30 15:45:17 +0000
+++ tests/modules/ApplicationManager/CMakeLists.txt	2016-06-06 19:34:22 +0000
@@ -5,10 +5,14 @@
 )
 
 include_directories(
-  ${APPLICATION_API_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
   ${CMAKE_SOURCE_DIR}/src/modules
   ${CMAKE_SOURCE_DIR}/tests/framework
+)
+
+include_directories(
+  SYSTEM
+  ${APPLICATION_API_INCLUDE_DIRS}
   ${MIRSERVER_INCLUDE_DIRS}
 )
 

=== modified file 'tests/modules/ApplicationManager/application_manager_test.cpp'
--- tests/modules/ApplicationManager/application_manager_test.cpp	2016-05-03 15:27:26 +0000
+++ tests/modules/ApplicationManager/application_manager_test.cpp	2016-06-06 19:34:22 +0000
@@ -118,6 +118,8 @@
 
     EXPECT_FALSE(authed);
     EXPECT_EQ(application, applicationManager.findApplication(dialer_app_id));
+
+    delete surface;
 }
 
 TEST_F(ApplicationManagerTests,application_dies_while_starting)
@@ -271,6 +273,10 @@
 
 TEST_F(ApplicationManagerTests,two_session_on_one_application)
 {
+    int argc = 0;
+    char* argv[0];
+    QCoreApplication qtApp(argc, argv); // app for deleteLater event
+
     using namespace ::testing;
     const pid_t a_procId = 5921;
     const char an_app_id[] = "some_app";
@@ -293,10 +299,18 @@
 
     EXPECT_EQ(true, authed);
     EXPECT_EQ(second_session, the_app->session()->session());
+
+    onSessionStopping(first_session);
+    onSessionStopping(second_session);
+    qtApp.sendPostedEvents(nullptr, QEvent::DeferredDelete);
 }
 
 TEST_F(ApplicationManagerTests,two_session_on_one_application_after_starting)
 {
+    int argc = 0;
+    char* argv[0];
+    QCoreApplication qtApp(argc, argv); // app for deleteLater event
+
     using namespace ::testing;
     const pid_t a_procId = 5921;
     const char an_app_id[] = "some_app";
@@ -323,6 +337,11 @@
     EXPECT_EQ(true, authed);
     EXPECT_EQ(Application::Running, the_app->state());
     EXPECT_EQ(first_session, the_app->session()->session());
+
+    onSessionStopping(first_session);
+    onSessionStopping(second_session);
+    delete aSurface;
+    qtApp.sendPostedEvents(nullptr, QEvent::DeferredDelete);
 }
 
 TEST_F(ApplicationManagerTests,starting_app_is_suspended_when_it_gets_ready_if_requested)
@@ -357,6 +376,8 @@
 
     // now that its ready, suspend process should have begun
     EXPECT_EQ(Application::InternalState::SuspendingWaitSession, app->internalState());
+
+    delete aSurface;
 }
 
 TEST_F(ApplicationManagerTests,requestFocusApplication)
@@ -746,6 +767,8 @@
     // Check application state is correctly set
     Application *theApp = applicationManager.findApplication(appId);
     EXPECT_EQ(theApp->state(), Application::Running);
+
+    delete surface;
 }
 
 /*
@@ -879,6 +902,8 @@
 
     EXPECT_EQ(2, countSpy.count()); //FIXME(greyback)
     EXPECT_EQ(0, applicationManager.count());
+
+    delete surface;
 }
 
 /*
@@ -921,6 +946,8 @@
 
     EXPECT_EQ(countSpy.count(), 2); //FIXME(greyback)
     EXPECT_EQ(applicationManager.count(), 0);
+
+    delete surface;
 }
 
 /*
@@ -971,6 +998,8 @@
 
     EXPECT_EQ(0, countSpy.count());
     EXPECT_EQ(1, applicationManager.count());
+
+    delete surface;
 }
 
 /*
@@ -1023,6 +1052,8 @@
 
     EXPECT_EQ(countSpy.count(), 0);
     EXPECT_EQ(applicationManager.count(), 1);
+
+    delete surface;
 }
 
 /*
@@ -1092,6 +1123,8 @@
 
     EXPECT_EQ(countSpy.count(), 2); //FIXME(greyback)
     EXPECT_EQ(applicationManager.count(), 0);
+
+    delete surface;
 }
 
 /*
@@ -1133,6 +1166,8 @@
 
     Application *app = applicationManager.findApplication(appId);
     EXPECT_EQ(nullptr, app);
+
+    delete surface;
 }
 
 /*
@@ -1187,6 +1222,8 @@
     EXPECT_EQ(1, applicationManager.count());
 
     EXPECT_EQ(Application::Stopped, app->state());
+
+    delete surface;
 }
 
 /*
@@ -1236,6 +1273,10 @@
  */
 TEST_F(ApplicationManagerTests,unexpectedStopOfForegroundWebapp)
 {
+    int argc = 0;
+    char* argv[0];
+    QCoreApplication qtApp(argc, argv); // app for deleteLater event
+
     using namespace ::testing;
     const QString appId("webapp");
     const pid_t procId1 = 5551;
@@ -1279,6 +1320,10 @@
 
     EXPECT_EQ(countSpy.count(), 2); //FIXME(greyback)
     EXPECT_EQ(applicationManager.count(), 0);
+
+    delete surface;
+
+    qtApp.sendPostedEvents(nullptr, QEvent::DeferredDelete);
 }
 
 /*
@@ -1287,6 +1332,10 @@
  */
 TEST_F(ApplicationManagerTests,unexpectedStopOfBackgroundWebapp)
 {
+    int argc = 0;
+    char* argv[0];
+    QCoreApplication qtApp(argc, argv); // app for deleteLater event
+
     using namespace ::testing;
     const QString appId("webapp");
     const pid_t procId1 = 5551;
@@ -1336,6 +1385,11 @@
     onSessionStopping(session1);
 
     EXPECT_EQ(0, countSpy.count());
+
+    delete surface1;
+    delete surface2;
+
+    qtApp.sendPostedEvents(nullptr, QEvent::DeferredDelete);
 }
 
 /*
@@ -1460,6 +1514,8 @@
 
     EXPECT_EQ(Application::Running, the_app->state());
     ASSERT_EQ(Application::InternalState::Running, the_app->internalState());
+
+    delete surface;
 }
 
 /*
@@ -1499,6 +1555,8 @@
     EXPECT_FALSE(sharedWakelock.enabled());
     ASSERT_EQ(Application::InternalState::RunningInBackground, application->internalState());
     EXPECT_EQ(Application::Running, application->state());
+
+    delete surface;
 }
 
 /*
@@ -1628,6 +1686,8 @@
 
     EXPECT_EQ(0, applicationManager.count());
     EXPECT_TRUE(dir.exists());
+
+    delete aSurface;
 }
 
 /*
@@ -1652,6 +1712,8 @@
     applicationManager.stopApplication(appId);
 
     EXPECT_EQ(1, spy.count());
+
+    delete surface;
 }
 
 
@@ -1899,4 +1961,6 @@
     surface->requestFocus();
 
     EXPECT_EQ(1, focusRequestedSpy.count());
+
+    delete surface;
 }

=== modified file 'tests/modules/SessionManager/CMakeLists.txt'
--- tests/modules/SessionManager/CMakeLists.txt	2015-09-30 15:45:17 +0000
+++ tests/modules/SessionManager/CMakeLists.txt	2016-06-06 19:34:22 +0000
@@ -6,10 +6,14 @@
 )
 
 include_directories(
-  ${APPLICATION_API_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
   ${CMAKE_SOURCE_DIR}/src/modules
   ${CMAKE_SOURCE_DIR}/tests/framework
+)
+
+include_directories(
+  SYSTEM
+  ${APPLICATION_API_INCLUDE_DIRS}
   ${MIRSERVER_INCLUDE_DIRS}
 )
 

=== modified file 'tests/modules/SessionManager/session_test.cpp'
--- tests/modules/SessionManager/session_test.cpp	2016-05-24 21:32:06 +0000
+++ tests/modules/SessionManager/session_test.cpp	2016-06-06 19:34:22 +0000
@@ -62,6 +62,8 @@
 
     surface->drawFirstFrame();
     EXPECT_EQ(Session::Running, session->state());
+
+    delete surface;
 }
 
 TEST_F(SessionTests, AddChildSession)
@@ -220,6 +222,7 @@
         FakeMirSurface *surface = new FakeMirSurface;
         session->registerSurface(surface);
         surface->drawFirstFrame();
+        delete surface;
     }
     EXPECT_EQ(Session::Running, session->state());
 
@@ -251,6 +254,7 @@
         FakeMirSurface *surface = new FakeMirSurface;
         session->registerSurface(surface);
         surface->drawFirstFrame();
+        delete surface;
     }
     EXPECT_EQ(Session::Running, session->state());
 
@@ -296,6 +300,7 @@
         FakeMirSurface *surface = new FakeMirSurface;
         session->registerSurface(surface);
         surface->drawFirstFrame();
+        delete surface;
     }
     EXPECT_EQ(Session::Running, session->state());
 

=== modified file 'tests/modules/SharedWakelock/CMakeLists.txt'
--- tests/modules/SharedWakelock/CMakeLists.txt	2015-09-30 15:45:17 +0000
+++ tests/modules/SharedWakelock/CMakeLists.txt	2016-06-06 19:34:22 +0000
@@ -5,6 +5,10 @@
 
 include_directories(
   ${CMAKE_SOURCE_DIR}/src/modules
+)
+
+include_directories(
+  SYSTEM
   ${QTDBUSTEST_INCLUDE_DIRS}
   ${QTDBUSMOCK_INCLUDE_DIRS}
 )

=== modified file 'tests/modules/SurfaceManager/CMakeLists.txt'
--- tests/modules/SurfaceManager/CMakeLists.txt	2016-05-24 20:13:10 +0000
+++ tests/modules/SurfaceManager/CMakeLists.txt	2016-06-06 19:34:22 +0000
@@ -9,6 +9,10 @@
   ${CMAKE_SOURCE_DIR}/src/modules
   ${CMAKE_SOURCE_DIR}/src/platforms/mirserver
   ${CMAKE_SOURCE_DIR}/tests/framework
+)
+
+include_directories(
+  SYSTEM
   ${MIRSERVER_INCLUDE_DIRS}
   ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
 )