diff options
| author | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2012-01-20 15:22:23 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2012-01-20 15:32:27 +0100 |
| commit | 4ca15f9ec4ea3716f06ae28e2405622ddacd6201 (patch) | |
| tree | 6b03619fb0b7a70cc1f3c38ab35858d00aeb6af6 /examples | |
| parent | d4a1953f9afd930067ce44817020e27d10c6856b (diff) | |
Fix duplicated QOpenGLFunctions usage
Change-Id: I3c90b705c0ef07e824768975fe1889e394acd82b
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qwindow-compositor/qwindowcompositor.cpp | 2 | ||||
| -rw-r--r-- | examples/qwindow-compositor/qwindowcompositor.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/examples/qwindow-compositor/qwindowcompositor.cpp b/examples/qwindow-compositor/qwindowcompositor.cpp index 644a7996f..d95dbbcb7 100644 --- a/examples/qwindow-compositor/qwindowcompositor.cpp +++ b/examples/qwindow-compositor/qwindowcompositor.cpp @@ -61,8 +61,6 @@ 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")); diff --git a/examples/qwindow-compositor/qwindowcompositor.h b/examples/qwindow-compositor/qwindowcompositor.h index 84c00d2d7..d5e770009 100644 --- a/examples/qwindow-compositor/qwindowcompositor.h +++ b/examples/qwindow-compositor/qwindowcompositor.h @@ -48,9 +48,8 @@ #include <QtGui/private/qopengltexturecache_p.h> #include <QObject> -#include <QOpenGLFunctions> -class QWindowCompositor : public QObject, public WaylandCompositor, protected QOpenGLFunctions +class QWindowCompositor : public QObject, public WaylandCompositor { Q_OBJECT public: |