From c28fde3fdac19fd5a5f614bb7983080031c924b3 Mon Sep 17 00:00:00 2001
From: Gerry Boland <gerry.boland@canonical.com>
Date: Wed, 2 Nov 2016 16:46:53 +0000
Subject: Mirclient: update based on upstream development in lp:qtubuntu

This is based on revision 360 of lp:qtubuntu.

Main features/bugs fixed:
- fix QQuickWidget-based app rendering
- wire up Qt window types to Mir to enable desktop-based applications
  to function with a window manager
- use QEGLPlatformContext and QEGLPBuffer instead of custom code
- correctly populate and update list of QScreens
- support for switching keyboard layouts
- improve window resizing to fix visual glitching

Change-Id: If816a858eb10b6356275d4b80c89a72562b3c29f
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
---
 src/plugins/platforms/mirclient/mirclient.pro | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'src/plugins/platforms/mirclient/mirclient.pro')

diff --git a/src/plugins/platforms/mirclient/mirclient.pro b/src/plugins/platforms/mirclient/mirclient.pro
index 0ba63601a9..d2da7e6ca0 100644
--- a/src/plugins/platforms/mirclient/mirclient.pro
+++ b/src/plugins/platforms/mirclient/mirclient.pro
@@ -5,6 +5,9 @@ QT += \
     theme_support-private eventdispatcher_support-private \
     fontdatabase_support-private egl_support-private
 
+qtHaveModule(linuxaccessibility_support-private): \
+    QT += linuxaccessibility_support-private
+
 DEFINES += MESA_EGL_NO_X11_HEADERS
 # CONFIG += c++11 # only enables C++0x
 QMAKE_CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden -std=c++11 -Werror -Wall
@@ -13,9 +16,12 @@ QMAKE_LFLAGS += -std=c++11 -Wl,-no-undefined
 QMAKE_USE_PRIVATE += mirclient
 
 SOURCES = \
+    qmirclientappstatecontroller.cpp \
     qmirclientbackingstore.cpp \
     qmirclientclipboard.cpp \
     qmirclientcursor.cpp \
+    qmirclientdebugextension.cpp \
+    qmirclientdesktopwindow.cpp \
     qmirclientglcontext.cpp \
     qmirclientinput.cpp \
     qmirclientintegration.cpp \
@@ -23,13 +29,17 @@ SOURCES = \
     qmirclientplatformservices.cpp \
     qmirclientplugin.cpp \
     qmirclientscreen.cpp \
+    qmirclientscreenobserver.cpp \
     qmirclienttheme.cpp \
     qmirclientwindow.cpp
 
 HEADERS = \
+    qmirclientappstatecontroller.h \
     qmirclientbackingstore.h \
     qmirclientclipboard.h \
     qmirclientcursor.h \
+    qmirclientdebugextension.h \
+    qmirclientdesktopwindow.h \
     qmirclientglcontext.h \
     qmirclientinput.h \
     qmirclientintegration.h \
@@ -39,9 +49,17 @@ HEADERS = \
     qmirclientplatformservices.h \
     qmirclientplugin.h \
     qmirclientscreen.h \
+    qmirclientscreenobserver.h \
     qmirclienttheme.h \
     qmirclientwindow.h
 
+# libxkbcommon
+!qtConfig(xkbcommon-system) {
+    include(../../../3rdparty/xkbcommon.pri)
+} else {
+    QMAKE_USE += xkbcommon
+}
+
 PLUGIN_TYPE = platforms
 PLUGIN_CLASS_NAME = MirServerIntegrationPlugin
 !equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = -
-- 
cgit v1.2.3