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++

[Gerry Boland (gerboland)]

Cool, thanks!!

review: Approve

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

FAILED: Continuous integration, rev:518
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/262/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/1886/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1912
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1848
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1848
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1848
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1839/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1839/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1839/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1839/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1839/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1839/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1839/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1839/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1839/console

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

This should be good. CI unhappy only as this based on the contents of the latest silo, which has a newer unity-api

[lp:~aacid/qtmir/system_includes]

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

Merge lp:~dandrader/qtmir/mirSurfaceInputBounds

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-07-01 16:15:54 +0000
+++ CMakeLists.txt	2016-07-15 15:13:44 +0000
@@ -83,22 +83,23 @@
 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=18)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=19)
 pkg_check_modules(CGMANAGER libcgmanager REQUIRED)
 
+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
@@ -109,13 +110,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-07-12 13:39:51 +0000
+++ debian/changelog	2016-07-15 15:13:44 +0000
@@ -49,6 +49,31 @@
 
  -- Albert Astals Cid <[e-mail]>  Tue, 14 Jun 2016 08:38:00 +0000
 
+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.20160602-0ubuntu1) yakkety; urgency=medium
 
   * rebuild for mir 0.23
 
=== modified file 'debian/control'
--- debian/control	2016-07-12 13:26:59 +0000
+++ debian/control	2016-07-15 15:13:44 +0000
@@ -23,7 +23,7 @@
                libubuntu-app-launch2-dev (>= 0.9),
                libubuntu-application-api-dev (>= 2.1.0),
                libudev-dev,
-               libunity-api-dev (>= 7.114),
+               libunity-api-dev (>= 7.116),
                liburl-dispatcher1-dev,
                libxkbcommon-dev,
                libxrender-dev,
@@ -94,7 +94,7 @@
 Conflicts: libqtmir,
            libunity-mir1,
 Provides: unity-application-impl,
-          unity-application-impl-17,
+          unity-application-impl-19,
 Description: Qt plugin for Unity specific Mir APIs
  QtMir provides Qt/QML bindings for Mir features that are exposed through the
  qtmir-desktop or qtmir-android QPA plugin such as Application management
 
=== modified file 'debian/gles-patches/convert-to-gles.patch'
--- debian/gles-patches/convert-to-gles.patch	2016-07-12 13:38:40 +0000
+++ debian/gles-patches/convert-to-gles.patch	2016-07-15 15:13:44 +0000
@@ -84,7 +84,7 @@
 -Conflicts: libqtmir,
 -           libunity-mir1,
 -Provides: unity-application-impl,
--          unity-application-impl-17,
+-          unity-application-impl-19,
 -Description: Qt plugin for Unity specific Mir APIs
 - QtMir provides Qt/QML bindings for Mir features that are exposed through the
 - qtmir-desktop or qtmir-android QPA plugin such as Application management
 
=== 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-07-15 15:13:44 +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-07-15 15:13:44 +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/modules/Unity/Application/CMakeLists.txt'
--- src/modules/Unity/Application/CMakeLists.txt	2016-07-01 16:15:54 +0000
+++ src/modules/Unity/Application/CMakeLists.txt	2016-07-15 15:13:44 +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}
     ${CGMANAGER_INCLUDE_DIRS}
 
@@ -33,7 +37,6 @@
     plugin.cpp
     dbuswindowstack.cpp
     mirsurfacemanager.cpp
-    ubuntukeyboardinfo.cpp
     mirfocuscontroller.cpp
     mirsurface.cpp
     mirsurfaceinterface.h
 
=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
--- src/modules/Unity/Application/mirsurface.cpp	2016-06-23 19:58:48 +0000
+++ src/modules/Unity/Application/mirsurface.cpp	2016-07-15 15:13:44 +0000
@@ -219,6 +219,7 @@
         connect(observer.get(), &SurfaceObserver::shellChromeChanged, this, [&](MirShellChrome shell_chrome) {
             setShellChrome(static_cast<Mir::ShellChrome>(shell_chrome));
         });
+        connect(observer.get(), &SurfaceObserver::inputBoundsChanged, this, &MirSurface::setInputBounds);
         observer->setListener(this);
     }
 
@@ -277,12 +278,15 @@
 {
     switch (attribute) {
     case mir_surface_attrib_type:
+        DEBUG_MSG << " type = " << mirSurfaceTypeToStr(state());
         Q_EMIT typeChanged(type());
         break;
     case mir_surface_attrib_state:
+        DEBUG_MSG << " state = " << mirSurfaceStateToStr(state());
         Q_EMIT stateChanged(state());
         break;
     case mir_surface_attrib_visibility:
+        DEBUG_MSG << " visible = " << visible();
         Q_EMIT visibleChanged(visible());
         break;
     default:
@@ -885,6 +889,24 @@
     m_surface->move_to(Point{ X{targetScreenTopLeftPx.x()}, Y{targetScreenTopLeftPx.y()} });
 }
 
+bool MirSurface::inputAreaContains(const QPoint &point) const
+{
+    bool result;
+
+
+    // Can't use it due to https://bugs.launchpad.net/mir/+bug/1598936
+    // FIXME: Use the line below instead of m_inputBounds once this bug gets fixed.
+    //result = m_surface->input_area_contains(mir::geometry::Point(point.x(), point.y()));
+
+    if (m_inputBounds.isNull()) {
+        result = true;
+    } else {
+        result = m_inputBounds.contains(point);
+    }
+
+    return result;
+}
+
 void MirSurface::setCursor(const QCursor &cursor)
 {
     DEBUG_MSG << "(" << qtCursorShapeToStr(cursor.shape()) << ")";
@@ -976,6 +998,11 @@
     return m_focused;
 }
 
+QRect MirSurface::inputBounds() const
+{
+    return m_inputBounds;
+}
+
 void MirSurface::requestFocus()
 {
     DEBUG_MSG << "()";
@@ -1017,3 +1044,12 @@
         m_closeTimer->start();
     }
 }
+
+void MirSurface::setInputBounds(const QRect &rect)
+{
+    if (m_inputBounds != rect) {
+        DEBUG_MSG << "(" << rect << ")";
+        m_inputBounds = rect;
+        Q_EMIT inputBoundsChanged(m_inputBounds);
+    }
+}
 
=== modified file 'src/modules/Unity/Application/mirsurface.h'
--- src/modules/Unity/Application/mirsurface.h	2016-06-23 19:58:48 +0000
+++ src/modules/Unity/Application/mirsurface.h	2016-07-15 15:13:44 +0000
@@ -24,6 +24,7 @@
 #include <QCursor>
 #include <QMutex>
 #include <QPointer>
+#include <QRect>
 #include <QSharedPointer>
 #include <QWeakPointer>
 #include <QSet>
@@ -89,6 +90,7 @@
     int heightIncrement() const override;
 
     bool focused() const override;
+    QRect inputBounds() const override;
 
     Q_INVOKABLE void requestFocus() override;
     Q_INVOKABLE void close() override;
@@ -148,9 +150,11 @@
 
     Mir::ShellChrome shellChrome() const override;
 
+    void setScreen(QScreen *screen) override;
+
     SessionInterface* session() override { return m_session.data(); }
 
-    void setScreen(QScreen *screen) override;
+    bool inputAreaContains(const QPoint &) const override;
 
     ////
     // Own API
@@ -177,6 +181,7 @@
     void emitSizeChanged();
     void setCursor(const QCursor &cursor);
     void onCloseTimedOut();
+    void setInputBounds(const QRect &rect);
 
 private:
     void syncSurfaceSizeWithItemSize();
@@ -226,6 +231,8 @@
     int m_widthIncrement{0};
     int m_heightIncrement{0};
 
+    QRect m_inputBounds;
+
     bool m_focused{false};
 
     enum ClosingState {
 
=== modified file 'src/modules/Unity/Application/mirsurfaceinterface.h'
--- src/modules/Unity/Application/mirsurfaceinterface.h	2016-06-23 19:58:48 +0000
+++ src/modules/Unity/Application/mirsurfaceinterface.h	2016-07-15 15:13:44 +0000
@@ -106,6 +106,8 @@
 
     virtual SessionInterface* session() = 0;
 
+    virtual bool inputAreaContains(const QPoint &) const = 0;
+
 public Q_SLOTS:
     virtual void onCompositorSwappedBuffers() = 0;
 
 
=== 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-07-15 15:13:44 +0000
@@ -20,7 +20,6 @@
 #include "mirsurfaceitem.h"
 #include "mirfocuscontroller.h"
 #include "logging.h"
-#include "ubuntukeyboardinfo.h"
 #include "tracepoints.h" // generated from tracepoints.tp
 #include "timestamp.h"
 
@@ -100,10 +99,6 @@
     setSmooth(true);
     setFlag(QQuickItem::ItemHasContents, true); //so scene graph will render this item
 
-    if (!UbuntuKeyboardInfo::instance()) {
-        new UbuntuKeyboardInfo;
-    }
-
     m_updateMirSurfaceSizeTimer.setSingleShot(true);
     m_updateMirSurfaceSizeTimer.setInterval(1);
     connect(&m_updateMirSurfaceSizeTimer, &QTimer::timeout, this, &MirSurfaceItem::updateMirSurfaceSize);
@@ -295,17 +290,9 @@
 
 void MirSurfaceItem::mousePressEvent(QMouseEvent *event)
 {
-    if (m_consumesInput && m_surface && m_surface->live()) {
-        if (type() == Mir::InputMethodType) {
-            // FIXME: Hack to get the VKB use case working while we don't have the proper solution in place.
-            if (isMouseInsideUbuntuKeyboard(event)) {
-                m_surface->mousePressEvent(event);
-            } else {
-                event->ignore();
-            }
-        } else {
-            m_surface->mousePressEvent(event);
-        }
+    auto mousePos = event->localPos().toPoint();
+    if (m_consumesInput && m_surface && m_surface->live() && m_surface->inputAreaContains(mousePos)) {
+        m_surface->mousePressEvent(event);
     } else {
         event->ignore();
     }
@@ -476,51 +463,26 @@
         return false;
     }
 
-    bool accepted = true;
-    if (type() == Mir::InputMethodType && eventType == QEvent::TouchBegin) {
-        // FIXME: Hack to get the VKB use case working while we don't have the proper solution in place.
-        if (hasTouchInsideUbuntuKeyboard(touchPoints)) {
-            validateAndDeliverTouchEvent(eventType, timestamp, mods, touchPoints, touchPointStates);
-        } else {
-            accepted = false;
-        }
-
-    } else {
-        // NB: If we are getting QEvent::TouchUpdate or QEvent::TouchEnd it's because we've
-        // previously accepted the corresponding QEvent::TouchBegin
-        validateAndDeliverTouchEvent(eventType, timestamp, mods, touchPoints, touchPointStates);
+    if (eventType == QEvent::TouchBegin && !hasTouchInsideInputRegion(touchPoints)) {
+        return false;
     }
-    return accepted;
+
+    validateAndDeliverTouchEvent(eventType, timestamp, mods, touchPoints, touchPointStates);
+
+    return true;
 }
 
-bool MirSurfaceItem::hasTouchInsideUbuntuKeyboard(const QList<QTouchEvent::TouchPoint> &touchPoints)
+bool MirSurfaceItem::hasTouchInsideInputRegion(const QList<QTouchEvent::TouchPoint> &touchPoints)
 {
-    UbuntuKeyboardInfo *ubuntuKeyboardInfo = UbuntuKeyboardInfo::instance();
-
     for (int i = 0; i < touchPoints.count(); ++i) {
         QPoint pos = touchPoints.at(i).pos().toPoint();
-        if (pos.x() >= ubuntuKeyboardInfo->x()
-                && pos.x() <= (ubuntuKeyboardInfo->x() + ubuntuKeyboardInfo->width())
-                && pos.y() >= ubuntuKeyboardInfo->y()
-                && pos.y() <= (ubuntuKeyboardInfo->y() + ubuntuKeyboardInfo->height())) {
+        if (m_surface->inputAreaContains(pos)) {
             return true;
         }
     }
     return false;
 }
 
-bool MirSurfaceItem::isMouseInsideUbuntuKeyboard(const QMouseEvent *event)
-{
-    UbuntuKeyboardInfo *ubuntuKeyboardInfo = UbuntuKeyboardInfo::instance();
-
-    const QPointF &pos = event->localPos();
-
-    return pos.x() >= ubuntuKeyboardInfo->x()
-        && pos.x() <= (ubuntuKeyboardInfo->x() + ubuntuKeyboardInfo->width())
-        && pos.y() >= ubuntuKeyboardInfo->y()
-        && pos.y() <= (ubuntuKeyboardInfo->y() + ubuntuKeyboardInfo->height());
-}
-
 Mir::State MirSurfaceItem::surfaceState() const
 {
     if (m_surface) {
 
=== 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-07-15 15:13:44 +0000
@@ -128,8 +128,7 @@
 private:
     void ensureTextureProvider();
 
-    bool hasTouchInsideUbuntuKeyboard(const QList<QTouchEvent::TouchPoint> &touchPoints);
-    bool isMouseInsideUbuntuKeyboard(const QMouseEvent *event);
+    bool hasTouchInsideInputRegion(const QList<QTouchEvent::TouchPoint> &touchPoints);
 
     QString appId() const;
     void endCurrentTouchSequence(ulong timestamp);
 
=== modified file 'src/modules/Unity/Application/plugin.cpp'
--- src/modules/Unity/Application/plugin.cpp	2016-03-28 18:02:26 +0000
+++ src/modules/Unity/Application/plugin.cpp	2016-07-15 15:13:44 +0000
@@ -25,7 +25,6 @@
 #include "mirsurfaceinterface.h"
 #include "mirsurfaceitem.h"
 #include "mirsurfacelistmodel.h"
-#include "ubuntukeyboardinfo.h"
 
 // platforms/mirserver
 #include <mirsingleton.h>
@@ -55,13 +54,6 @@
     return qtmir::MirSurfaceManager::singleton();
 }
 
-QObject* ubuntuKeyboardInfoSingleton(QQmlEngine* /*engine*/, QJSEngine* /*scriptEngine*/) {
-    if (!UbuntuKeyboardInfo::instance()) {
-        new UbuntuKeyboardInfo;
-    }
-    return UbuntuKeyboardInfo::instance();
-}
-
 QObject* mirSingleton(QQmlEngine* /*engine*/, QJSEngine* /*scriptEngine*/) {
     return qtmir::Mir::instance();
 }
@@ -101,8 +93,6 @@
         qmlRegisterUncreatableType<unity::shell::application::MirSurfaceInterface>(
                     uri, 0, 1, "MirSurface", "MirSurface can't be instantiated from QML");
         qmlRegisterType<qtmir::MirSurfaceItem>(uri, 0, 1, "MirSurfaceItem");
-        qmlRegisterSingletonType<qtmir::UbuntuKeyboardInfo>(
-                uri, 0, 1, "UbuntuKeyboardInfo", ubuntuKeyboardInfoSingleton);
         qmlRegisterSingletonType<qtmir::Mir>(uri, 0, 1, "Mir", mirSingleton);
     }
 
 
=== removed file 'src/modules/Unity/Application/ubuntukeyboardinfo.cpp'
--- src/modules/Unity/Application/ubuntukeyboardinfo.cpp	2016-05-27 07:45:26 +0000
+++ src/modules/Unity/Application/ubuntukeyboardinfo.cpp	1970-01-01 00:00:00 +0000
@@ -1,173 +0,0 @@
-/*
- * Copyright (C) 2013-2015 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3, as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ubuntukeyboardinfo.h"
-
-#include <QDir>
-
-namespace qtmir {
-
-namespace {
-    const int gConnectionAttemptIntervalMs = 5000;
-    const int gMaxConsecutiveAttempts = 10;
-    const char gServerName[] = "ubuntu-keyboard-info";
-}
-
-UbuntuKeyboardInfo* UbuntuKeyboardInfo::m_instance = nullptr;
-
-UbuntuKeyboardInfo* UbuntuKeyboardInfo::instance()
-{
-    return m_instance;
-}
-
-UbuntuKeyboardInfo::UbuntuKeyboardInfo(QObject *parent)
-    : QObject(parent),
-    m_consecutiveAttempts(0),
-    m_lastX(0),
-    m_lastY(0),
-    m_lastWidth(0),
-    m_lastHeight(0)
-{
-    if (m_instance) {
-        qFatal("Cannot have more than one instance of UbuntuKeyboardInfo simultaneously.");
-    }
-    m_instance = this;
-
-    connect(&m_socket, &QLocalSocket::stateChanged, this, &UbuntuKeyboardInfo::onSocketStateChanged);
-    connect(&m_socket, &QIODevice::readyRead,
-            this, &UbuntuKeyboardInfo::readAllBytesFromSocket);
-
-    buildSocketFilePath();
-
-    typedef void (QLocalSocket::*MemberFunctionType)(QLocalSocket::LocalSocketError);
-    MemberFunctionType funcPointer = &QLocalSocket::error;
-    connect(&m_socket, funcPointer,
-            this, &UbuntuKeyboardInfo::onSocketError);
-
-    m_connectionRetryTimer.setInterval(gConnectionAttemptIntervalMs);
-    m_connectionRetryTimer.setSingleShot(true);
-    connect(&m_connectionRetryTimer, &QTimer::timeout,
-            this, &UbuntuKeyboardInfo::tryConnectingToServer);
-    tryConnectingToServer();
-}
-
-UbuntuKeyboardInfo::~UbuntuKeyboardInfo()
-{
-    // Make sure we don't get onSocketStateChanged() called during
-    // destruction.
-    m_socket.disconnect(this);
-
-    Q_ASSERT(m_instance);
-    m_instance = nullptr;
-}
-
-void UbuntuKeyboardInfo::tryConnectingToServer()
-{
-    ++m_consecutiveAttempts;
-    Q_ASSERT(!m_socketFilePath.isEmpty());
-    m_socket.connectToServer(m_socketFilePath, QIODevice::ReadOnly);
-}
-
-void UbuntuKeyboardInfo::onSocketStateChanged(QLocalSocket::LocalSocketState socketState)
-{
-    switch (socketState) {
-    case QLocalSocket::UnconnectedState:
-        retryConnection();
-        break;
-    case QLocalSocket::ConnectedState:
-        m_consecutiveAttempts = 0;
-        break;
-    default:
-        break;
-    }
-}
-
-void UbuntuKeyboardInfo::onSocketError(QLocalSocket::LocalSocketError socketError)
-{
-    Q_UNUSED(socketError);
-    qWarning() << "UbuntuKeyboardInfo - socket error:" << m_socket.errorString();
-}
-
-void UbuntuKeyboardInfo::retryConnection()
-{
-    // Polling every gConnectionAttemptIntervalMs. Not the best approach but could be worse.
-    if (m_consecutiveAttempts < gMaxConsecutiveAttempts) {
-        if (!m_connectionRetryTimer.isActive()) {
-            m_connectionRetryTimer.start();
-        }
-    } else {
-        qCritical() << "Failed to connect to" << m_socketFilePath << "after"
-                    << m_consecutiveAttempts << "failed attempts";
-
-        // it shouldn't be running, but just to be sure.
-        m_connectionRetryTimer.stop();
-    }
-}
-
-void UbuntuKeyboardInfo::readAllBytesFromSocket()
-{
-    while (m_socket.bytesAvailable() > 0) {
-        readInfoFromSocket();
-    }
-}
-
-void UbuntuKeyboardInfo::readInfoFromSocket()
-{
-    const size_t sharedInfoSize = sizeof(struct SharedInfo);
-    QByteArray bytes = m_socket.read(sharedInfoSize);
-    if (bytes.size() != sharedInfoSize) {
-        qWarning() << "UbuntuKeyboardInfo: expected to receive" << sharedInfoSize
-                   << "but got" << bytes.size();
-        return;
-    }
-
-    {
-        struct SharedInfo *sharedInfo = reinterpret_cast<struct SharedInfo*>(bytes.data());
-
-        if (m_lastX != sharedInfo->keyboardX) {
-            m_lastX = sharedInfo->keyboardX;
-            Q_EMIT xChanged(m_lastX);
-        }
-
-        if (m_lastY != sharedInfo->keyboardY) {
-            m_lastY = sharedInfo->keyboardY;
-            Q_EMIT yChanged(m_lastY);
-        }
-
-        if (m_lastWidth != sharedInfo->keyboardWidth) {
-            m_lastWidth = sharedInfo->keyboardWidth;
-            Q_EMIT widthChanged(m_lastWidth);
-        }
-
-        if (m_lastHeight != sharedInfo->keyboardHeight) {
-            m_lastHeight = sharedInfo->keyboardHeight;
-            Q_EMIT heightChanged(m_lastHeight);
-        }
-    }
-}
-
-void UbuntuKeyboardInfo::buildSocketFilePath()
-{
-    char *xdgRuntimeDir = getenv("XDG_RUNTIME_DIR");
-
-    if (xdgRuntimeDir) {
-        m_socketFilePath = QDir(xdgRuntimeDir).filePath(gServerName);
-    } else {
-        m_socketFilePath = QDir("/tmp").filePath(gServerName);
-    }
-}
-
-} // namespace qtmir
 
=== removed file 'src/modules/Unity/Application/ubuntukeyboardinfo.h'
--- src/modules/Unity/Application/ubuntukeyboardinfo.h	2015-08-11 12:08:32 +0000
+++ src/modules/Unity/Application/ubuntukeyboardinfo.h	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2013-2015 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3, as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef UBUNTU_KEYBOARD_INFO_H
-#define UBUNTU_KEYBOARD_INFO_H
-
-#include <QLocalSocket>
-#include <QTimer>
-
-namespace qtmir {
-
-// Temporary solution to get information about the onscreen keyboard
-// This shouldn't be needed once the OSK is a properly sized surface
-// instead of a fullscreen one.
-class UbuntuKeyboardInfo : public QObject {
-    Q_OBJECT
-    Q_PROPERTY(qreal x READ x NOTIFY xChanged)
-    Q_PROPERTY(qreal y READ y NOTIFY yChanged)
-    Q_PROPERTY(qreal width READ width NOTIFY widthChanged)
-    Q_PROPERTY(qreal height READ height NOTIFY heightChanged)
-public:
-    UbuntuKeyboardInfo(QObject *parent = 0);
-    virtual ~UbuntuKeyboardInfo();
-
-    static UbuntuKeyboardInfo* instance();
-
-    qreal x() const { return m_lastX; }
-    qreal y() const { return m_lastY; }
-    qreal width() const { return m_lastWidth; }
-    qreal height() const { return m_lastHeight; }
-
-Q_SIGNALS:
-    void xChanged(qreal x);
-    void yChanged(qreal y);
-    void widthChanged(qreal width);
-    void heightChanged(qreal height);
-
-private Q_SLOTS:
-    void tryConnectingToServer();
-    void onSocketStateChanged(QLocalSocket::LocalSocketState socketState);
-    void onSocketError(QLocalSocket::LocalSocketError socketError);
-    void readAllBytesFromSocket();
-
-private:
-    // NB! Must match the definition in ubuntu-keyboard. Not worth creating a shared header
-    // just for that.
-    struct SharedInfo {
-        qint32 keyboardX;
-        qint32 keyboardY;
-        qint32 keyboardWidth;
-        qint32 keyboardHeight;
-    };
-    void readInfoFromSocket();
-    void retryConnection();
-    void buildSocketFilePath();
-
-    int m_consecutiveAttempts;
-
-    QLocalSocket m_socket;
-    qint32 m_lastX;
-    qint32 m_lastY;
-    qint32 m_lastWidth;
-    qint32 m_lastHeight;
-    QTimer m_connectionRetryTimer;
-
-    // Path to the socket file created by ubuntu-keyboard
-    QString m_socketFilePath;
-
-    static UbuntuKeyboardInfo* m_instance;
-};
-
-} // namespace qtmir
-
-#endif // UBUNTU_KEYBOARD_INFO_H
 
=== 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-07-15 15:13:44 +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-06-14 08:33:55 +0000
+++ src/platforms/mirserver/CMakeLists.txt	2016-07-15 15:13:44 +0000
@@ -26,6 +26,10 @@
 include_directories(
     ${CMAKE_SOURCE_DIR}/src/common
 
+)
+
+include_directories(
+  SYSTEM
     ${MIRCOMMON_INCLUDE_DIRS}
     ${MIRSERVER_INCLUDE_DIRS}
     ${MIRRENDERERGLDEV_INCLUDE_DIRS}
 
=== modified file 'src/platforms/mirserver/mirwindowmanager.cpp'
--- src/platforms/mirserver/mirwindowmanager.cpp	2016-05-27 08:34:18 +0000
+++ src/platforms/mirserver/mirwindowmanager.cpp	2016-07-15 15:13:44 +0000
@@ -197,14 +197,19 @@
                                           const mir::shell::SurfaceSpecification& modifications)
 {
     QMutexLocker locker(&SurfaceObserver::mutex);
+
+    if (modifications.name.is_set()) {
+        surface->rename(modifications.name.value());
+    }
+
+    if (modifications.input_shape.is_set()) {
+        surface->set_input_region(modifications.input_shape.value());
+    }
+
     SurfaceObserver *observer = SurfaceObserver::observerForSurface(surface.get());
     if (observer) {
         observer->notifySurfaceModifications(modifications);
     }
-
-    if (modifications.name.is_set()) {
-        surface->rename(modifications.name.value());
-    }
 }
 
 std::shared_ptr<MirWindowManager> MirWindowManager::create(
 
=== 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-07-15 15:13:44 +0000
@@ -28,6 +28,22 @@
 #include <mir/geometry/size.h>
 #include <mir/shell/surface_specification.h>
 
+namespace {
+
+QRect calculateBoundingRect(const std::vector<mir::geometry::Rectangle> &rectVector)
+{
+    QRect boundingRect;
+    for (auto mirRect : rectVector) {
+        boundingRect |= QRect(mirRect.top_left.x.as_int(),
+                mirRect.top_left.y.as_int(),
+                mirRect.size.width.as_int(),
+                mirRect.size.height.as_int());
+    }
+    return boundingRect;
+}
+
+} // anonymous namespace
+
 QMap<const mir::scene::Surface*, SurfaceObserver*> SurfaceObserver::m_surfaceToObserverMap;
 QMutex SurfaceObserver::mutex;
 
@@ -154,6 +170,10 @@
     if (modifications.shell_chrome.is_set()) {
         Q_EMIT shellChromeChanged(modifications.shell_chrome.value());
     }
+    if (modifications.input_shape.is_set()) {
+        QRect qRect = calculateBoundingRect(modifications.input_shape.value());
+        Q_EMIT inputBoundsChanged(qRect);
+    }
 }
 
 SurfaceObserver *SurfaceObserver::observerForSurface(const mir::scene::Surface *surface)
 
=== 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-07-15 15:13:44 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2015 Canonical, Ltd.
+ * Copyright (C) 2014-2016 Canonical, Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it under
  * the terms of the GNU Lesser General Public License version 3, as published by
@@ -22,6 +22,7 @@
 #include <QObject>
 #include <QMap>
 #include <QMutex>
+#include <QRect>
 #include <QSize>
 #include <mir/scene/surface_observer.h>
 
@@ -84,6 +85,7 @@
     void widthIncrementChanged(int);
     void heightIncrementChanged(int);
     void shellChromeChanged(MirShellChrome);
+    void inputBoundsChanged(const QRect &rect);
 
 private:
     QCursor createQCursorFromMirCursorImage(const mir::graphics::CursorImage &cursorImage);
 
=== modified file 'tests/framework/CMakeLists.txt'
--- tests/framework/CMakeLists.txt	2016-05-24 20:13:10 +0000
+++ tests/framework/CMakeLists.txt	2016-07-15 15:13:44 +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_mirsurface.h'
--- tests/framework/fake_mirsurface.h	2016-06-23 19:58:48 +0000
+++ tests/framework/fake_mirsurface.h	2016-07-15 15:13:44 +0000
@@ -76,6 +76,7 @@
     Mir::ShellChrome shellChrome() const override { return Mir::NormalChrome; }
 
     bool focused() const override { return false; }
+    QRect inputBounds() const override { return QRect(0,0,10,10); }
 
     void requestFocus() override {
         Q_EMIT focusRequested();
@@ -85,8 +86,6 @@
         Q_EMIT closeRequested();
     }
 
-    void setScreen(QScreen *) override {}
-
     void raise() override {}
 
     ////
@@ -133,8 +132,12 @@
 
     QCursor cursor() const override { return QCursor(); }
 
+    void setScreen(QScreen *) override {}
+
     SessionInterface* session() override { return m_session; }
 
+    bool inputAreaContains(const QPoint &) const override { return true; }
+
 public Q_SLOTS:
     void onCompositorSwappedBuffers() override;
 
 
=== 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-07-15 15:13:44 +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-07-15 15:13:44 +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/Screen/CMakeLists.txt'
--- tests/mirserver/Screen/CMakeLists.txt	2015-11-11 10:43:36 +0000
+++ tests/mirserver/Screen/CMakeLists.txt	2016-07-15 15:13:44 +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-07-15 15:13:44 +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/WindowManager/CMakeLists.txt'
--- tests/mirserver/WindowManager/CMakeLists.txt	2016-03-10 11:55:28 +0000
+++ tests/mirserver/WindowManager/CMakeLists.txt	2016-07-15 15:13:44 +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-07-15 15:13:44 +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/ApplicationManager/CMakeLists.txt'
--- tests/modules/ApplicationManager/CMakeLists.txt	2015-09-30 15:45:17 +0000
+++ tests/modules/ApplicationManager/CMakeLists.txt	2016-07-15 15:13:44 +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/SessionManager/CMakeLists.txt'
--- tests/modules/SessionManager/CMakeLists.txt	2015-09-30 15:45:17 +0000
+++ tests/modules/SessionManager/CMakeLists.txt	2016-07-15 15:13:44 +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/SharedWakelock/CMakeLists.txt'
--- tests/modules/SharedWakelock/CMakeLists.txt	2015-09-30 15:45:17 +0000
+++ tests/modules/SharedWakelock/CMakeLists.txt	2016-07-15 15:13:44 +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-07-15 15:13:44 +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}
 )