From bfd367c6ec37c9d883c51316a149447b63005011 Mon Sep 17 00:00:00 2001
From: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
Date: Thu, 10 Dec 2015 11:01:29 +0100
Subject: Mirclient: update with upstream changes

Merge in the changes up to revision 306 of the lp:qtubuntu repo.

Change-Id: I55dcb9e06e0a3503d6abe4b0894d5ef5a785b6bb
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
---
 src/plugins/platforms/mirclient/qmirclientintegration.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/plugins/platforms/mirclient/qmirclientintegration.h')

diff --git a/src/plugins/platforms/mirclient/qmirclientintegration.h b/src/plugins/platforms/mirclient/qmirclientintegration.h
index 2960209691..e41cbe2cee 100644
--- a/src/plugins/platforms/mirclient/qmirclientintegration.h
+++ b/src/plugins/platforms/mirclient/qmirclientintegration.h
@@ -49,6 +49,7 @@
 
 class QMirClientClipboard;
 class QMirClientInput;
+class QMirClientNativeInterface;
 class QMirClientScreen;
 
 class QMirClientClientIntegration : public QPlatformIntegration {
@@ -59,7 +60,7 @@ public:
     // QPlatformIntegration methods.
     bool hasCapability(QPlatformIntegration::Capability cap) const override;
     QAbstractEventDispatcher *createEventDispatcher() const override;
-    QPlatformNativeInterface* nativeInterface() const override { return mNativeInterface; }
+    QPlatformNativeInterface* nativeInterface() const override;
     QPlatformBackingStore* createPlatformBackingStore(QWindow* window) const override;
     QPlatformOpenGLContext* createPlatformOpenGLContext(QOpenGLContext* context) const override;
     QPlatformFontDatabase* fontDatabase() const override { return mFontDb; }
@@ -79,7 +80,7 @@ private:
     void setupOptions();
     void setupDescription();
 
-    QPlatformNativeInterface* mNativeInterface;
+    QMirClientNativeInterface* mNativeInterface;
     QPlatformFontDatabase* mFontDb;
 
     QMirClientPlatformServices* mServices;
-- 
cgit v1.2.3