Get declarative and wayland EGL backend working for Qt compositor.

3 files changed, 11 insertions, 1 deletions

diff --git a/src/gui/kernel/qguiglcontext_qpa.h b/src/gui/kernel/qguiglcontext_qpa.h
index 65e9fb4c3f..9e62905b68 100644
--- a/src/gui/kernel/qguiglcontext_qpa.h
+++ b/src/gui/kernel/qguiglcontext_qpa.h
@@ -45,6 +45,8 @@
 #include <QtCore/qnamespace.h>
 #include <QtCore/QScopedPointer>
 
+#include <QSurfaceFormat>
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -54,7 +56,6 @@ QT_MODULE(Gui)
 class QGuiGLContextPrivate;
 class QPlatformGLContext;
 class QSurface;
-class QSurfaceFormat;
 
 class Q_GUI_EXPORT QGuiGLContext
 {
diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.cpp b/src/gui/kernel/qplatformnativeinterface_qpa.cpp
index ded917e398..82d6a97a47 100644
--- a/src/gui/kernel/qplatformnativeinterface_qpa.cpp
+++ b/src/gui/kernel/qplatformnativeinterface_qpa.cpp
@@ -50,4 +50,11 @@ void *QPlatformNativeInterface::nativeResourceForWindow(const QByteArray &resour
     return 0;
 }
 
+void *QPlatformNativeInterface::nativeResourceForContext(const QByteArray &resource, QGuiGLContext *context)
+{
+    Q_UNUSED(resource);
+    Q_UNUSED(context);
+    return 0;
+}
+
 QT_END_NAMESPACE
diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.h b/src/gui/kernel/qplatformnativeinterface_qpa.h
index 8e370fb2a5..edc1a9d96e 100644
--- a/src/gui/kernel/qplatformnativeinterface_qpa.h
+++ b/src/gui/kernel/qplatformnativeinterface_qpa.h
@@ -50,11 +50,13 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Gui)
 
+class QGuiGLContext;
 class QWindow;
 
 class Q_GUI_EXPORT QPlatformNativeInterface
 {
 public:
+    virtual void *nativeResourceForContext(const QByteArray &resource, QGuiGLContext *context);
     virtual void *nativeResourceForWindow(const QByteArray &resource, QWindow *window);
 };