Use QOpenGLFunctions in qwindow-compositor.

To keep it building with desktop OpenGL.

Change-Id: I82685926461fc3249ed7a53e741b653273fe6f5c
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

diff --git a/examples/qwindow-compositor/qwindowcompositor.cpp b/examples/qwindow-compositor/qwindowcompositor.cpp
index 7a61804..b88dcf5 100644 (file)
--- a/examples/qwindow-compositor/qwindowcompositor.cpp
+++ b/examples/qwindow-compositor/qwindowcompositor.cpp
@@ -14,14 +14,14 @@ QWindowCompositor::QWindowCompositor(QOpenGLWindow *window)
     enableSubSurfaceExtension();
     m_window->makeCurrent();
 
+    initializeGLFunctions();
+
     m_textureCache = new QOpenGLTextureCache(m_window->context());
     m_textureBlitter = new TextureBlitter();
     m_backgroundImage = QImage(QLatin1String(":/background.jpg"));
     m_renderScheduler.setSingleShot(true);
     connect(&m_renderScheduler,SIGNAL(timeout()),this,SLOT(render()));
 
-
-
     glGenFramebuffers(1,&m_surface_fbo);
 
     window->installEventFilter(this);

diff --git a/examples/qwindow-compositor/qwindowcompositor.h b/examples/qwindow-compositor/qwindowcompositor.h
index a061ea8..de01c52 100644 (file)
--- a/examples/qwindow-compositor/qwindowcompositor.h
+++ b/examples/qwindow-compositor/qwindowcompositor.h
@@ -7,10 +7,10 @@
 #include "qopenglwindow.h"
 
 #include <QtGui/private/qopengltexturecache_p.h>
-
 #include <QObject>
+#include <QOpenGLFunctions>
 
-class QWindowCompositor : public QObject, public WaylandCompositor
+class QWindowCompositor : public QObject, public WaylandCompositor, protected QOpenGLFunctions
 {
     Q_OBJECT
 public: