Merge commit 'dev' into 'wip/cmake-merge'

Change-Id: I176c40d031be26a1dd1cf08843e448a660598783

1 files changed, 11 insertions, 1 deletions

diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h b/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h
index 5e1c6b799b..5ef51a15a8 100644
--- a/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h
+++ b/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h
@@ -52,12 +52,19 @@ QT_BEGIN_NAMESPACE
 class QOffscreenX11Connection;
 class QOffscreenX11Info;
 
-class QOffscreenX11Integration : public QOffscreenIntegration
+class QOffscreenX11Integration : public QOffscreenIntegration,  public QPlatformNativeInterface
 {
 public:
     bool hasCapability(QPlatformIntegration::Capability cap) const override;
 
     QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const override;
+    QPlatformNativeInterface *nativeInterface()const override;
+
+    // QPlatformNativeInterface
+    void *nativeResourceForScreen(const QByteArray &resource, QScreen *screen) override;
+#ifndef QT_NO_OPENGL
+    void *nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context) override;
+#endif
 
 private:
     mutable QScopedPointer<QOffscreenX11Connection> m_connection;
@@ -97,6 +104,9 @@ public:
     bool isSharing() const override;
     bool isValid() const override;
 
+    void *glxConfig() const;
+    void *glxContext() const;
+
 private:
     QScopedPointer<QOffscreenX11GLXContextData> d;
 };