Added QWindowContext and got wiggly up and running with xcb.

(cherry picked from commit c980e4ef4ebc7699a6c3a7529d3f08ebafc21ffe)

1 files changed, 5 insertions, 3 deletions

diff --git a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
index b2ca1beb6e..bef2d573d0 100644
--- a/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
+++ b/src/plugins/platforms/xcb/qxcbnativeinterface.cpp
@@ -48,6 +48,8 @@
 
 #include <QtCore/QDebug>
 
+#include <QtGui/qwindowcontext_qpa.h>
+
 #if defined(XCB_USE_EGL)
 #include "../eglconvenience/qeglplatformcontext.h"
 #elif defined (XCB_USE_DRI2)
@@ -162,14 +164,14 @@ void *QXcbNativeInterface::graphicsDeviceForWidget(QWidget *widget)
 void * QXcbNativeInterface::eglContextForWidget(QWidget *widget)
 {
     Q_ASSERT(widget);
-    if (!widget->platformWindow()) {
+    if (!widget->windowHandle()) {
         qDebug() << "QPlatformWindow does not exist for widget" << widget
                  << "cannot return EGLContext";
         return 0;
     }
-    QPlatformGLContext *platformContext = widget->platformWindow()->glContext();
+    QPlatformGLContext *platformContext = widget->windowHandle()->glContext()->handle();
     if (!platformContext) {
-        qDebug() << "QPlatformWindow" << widget->platformWindow() << "does not have a glContext"
+        qDebug() << "QWindow" << widget->windowHandle() << "does not have a glContext"
                  << "cannot return EGLContext";
         return 0;
     }