From 10f399ce88e5d42a3c71e57de1a404785d66b8f0 Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@nokia.com>
Date: Thu, 8 Sep 2011 17:56:32 +0200
Subject: [PATCH] Compile fixes

---
 examples/qml-compositor/main.cpp                                     | 2 +-
 .../hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp | 5 +++--
 .../hardware_integration/xcomposite_share/xcomposite_share.pri       | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/examples/qml-compositor/main.cpp b/examples/qml-compositor/main.cpp
index 134760d..fdf27b3 100644
--- a/examples/qml-compositor/main.cpp
+++ b/examples/qml-compositor/main.cpp
@@ -57,7 +57,7 @@ class QmlCompositor : public QSGView, public WaylandCompositor
 {
     Q_OBJECT
 public:
-    QmlCompositor() : WaylandCompositor(this, const_cast<QGLContext *>(QGLContext::currentContext())) {
+    QmlCompositor() : WaylandCompositor(this, const_cast<QOpenGLContext *>(QOpenGLContext::currentContext())) {
         //setMouseTracking(true);
         setSource(QUrl(QLatin1String("qrc:qml/QmlCompositor/main.qml")));
         setResizeMode(QSGView::SizeRootObjectToView);
diff --git a/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp b/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp
index 12dd28b..f109414 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp
+++ b/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp
@@ -5,7 +5,7 @@
 #include "wayland-xcomposite-server-protocol.h"
 
 #include <QtGui/QPlatformNativeInterface>
-#include <QtGui/QGuiGLContext>
+#include <QtGui/QOpenGLContext>
 
 #include "xcompositebuffer.h"
 #include "xcompositehandler.h"
@@ -58,7 +58,8 @@ void XCompositeGLXIntegration::initializeHardware(Wayland::Display *waylandDispl
     XCompositeHandler *handler = new XCompositeHandler(m_compositor->handle(),mDisplay,m_compositor->window());
     waylandDisplay->addGlobalObject(handler->base(), &wl_xcomposite_interface, &XCompositeHandler::xcomposite_interface,XCompositeHandler::send_root_information);
 
-    QGuiGLContext *glContext = new QGuiGLContext();
+    QOpenGLContext *glContext = new QOpenGLContext();
+    glContext->create();
 
     m_glxBindTexImageEXT = reinterpret_cast<PFNGLXBINDTEXIMAGEEXTPROC>(glContext->getProcAddress("glXBindTexImageEXT"));
     if (!m_glxBindTexImageEXT) {
diff --git a/src/qt-compositor/hardware_integration/xcomposite_share/xcomposite_share.pri b/src/qt-compositor/hardware_integration/xcomposite_share/xcomposite_share.pri
index 31faa90..e4001a5 100644
--- a/src/qt-compositor/hardware_integration/xcomposite_share/xcomposite_share.pri
+++ b/src/qt-compositor/hardware_integration/xcomposite_share/xcomposite_share.pri
@@ -10,3 +10,5 @@ SOURCES += \
     $$PWD/wayland-xcomposite-protocol.c \
     $$PWD/xcompositebuffer.cpp \
     $$PWD/xcompositehandler.cpp
+
+QT += gui-private
-- 
2.7.4