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

[Albert Astals Cid]

Mark system includes as such

 * Are there any related MPs required for this MP to build/function as expected?
Prereq

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

[lp:~aacid/qtmir/system_includes]

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

spacing++

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

Merge lp:~dandrader/qtmir/mirSurfaceInputBounds

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-05-18 20:56:14 +0000
+++ CMakeLists.txt	2016-06-06 19:37:34 +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:37:34 +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:37:34 +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:37:34 +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:37:34 +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:37:34 +0000
@@ -54,6 +54,7 @@
         break;
     case QEvent::TouchCancel:
         message.append("TouchCancel ");
+        break;
     default:
         message.append("TouchUNKNOWN ");
     }
 
=== 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:37:34 +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:37:34 +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()
@@ -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;
 }
@@ -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
@@ -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:37:34 +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);
@@ -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/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:37:34 +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:37:34 +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/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:37:34 +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,7 +86,7 @@
 
 Session::~Session()
 {
-    qCDebug(QTMIR_SESSIONS) << "Session::~Session() " << name();
+    DEBUG_MSG << "()";
     stopPromptSessions();
 
     QList<SessionInterface*> children(m_children->list());
@@ -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);
 
@@ -452,16 +453,14 @@
 
 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);
 }
@@ -477,7 +476,7 @@
     QListIterator<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);
     }
@@ -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/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:37:34 +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/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:37:34 +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)
 {
 
=== 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:37:34 +0000
@@ -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:37:34 +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/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:37:34 +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/mirwindowmanager.cpp'
--- src/platforms/mirserver/mirwindowmanager.cpp	2016-04-28 12:48:48 +0000
+++ src/platforms/mirserver/mirwindowmanager.cpp	2016-06-06 19:37:34 +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 'tests/framework/CMakeLists.txt'
--- tests/framework/CMakeLists.txt	2016-05-24 20:13:10 +0000
+++ tests/framework/CMakeLists.txt	2016-06-06 19:37:34 +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/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:37:34 +0000
@@ -22,6 +22,7 @@
 {
 
 MockSession::MockSession()
+    : m_sessionId(-1)
 {
 }
 
 
=== 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:37:34 +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:37:34 +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:37:34 +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:37:34 +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:37:34 +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:37:34 +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:37:34 +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:37:34 +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:37:34 +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:37:34 +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:37:34 +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:37:34 +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:37:34 +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:37:34 +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:37:34 +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:37:34 +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}
 )