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>

1 files changed, 6 insertions, 9 deletions

diff --git a/src/plugins/platforms/mirclient/qmirclientplugin.cpp b/src/plugins/platforms/mirclient/qmirclientplugin.cpp
index 201b68c304..fc44edfe40 100644
--- a/src/plugins/platforms/mirclient/qmirclientplugin.cpp
+++ b/src/plugins/platforms/mirclient/qmirclientplugin.cpp
@@ -40,19 +40,16 @@
 
 #include "qmirclientplugin.h"
 #include "qmirclientintegration.h"
+#include "qmirclientlogging.h"
 
-QStringList QMirClientIntegrationPlugin::keys() const
-{
-    QStringList list;
-    list << QStringLiteral("mirclient");
-    return list;
-}
+Q_LOGGING_CATEGORY(mirclient, "qt.qpa.mirclient", QtWarningMsg)
 
-QPlatformIntegration* QMirClientIntegrationPlugin::create(const QString &system,
-                                                               const QStringList &)
+QPlatformIntegration *QMirClientIntegrationPlugin::create(const QString &system,
+                                                          const QStringList &/*paramList*/,
+                                                          int &argc, char **argv)
 {
     if (system.toLower() == QLatin1String("mirclient")) {
-        return new QMirClientClientIntegration;
+        return new QMirClientClientIntegration(argc, argv);
     } else {
         return 0;
     }