diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-12-05 17:09:02 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.p.agocs@nokia.com> | 2011-12-07 09:58:35 +0100 |
| commit | 4c89518228012ddc3602eab405e4b5fb8108fcdf (patch) | |
| tree | 615d4fdc38999e408d52998c39760064d223b652 /examples/qwindow-compositor/surfacerenderer.h | |
| parent | 542eca71e074b5110df2aaf822449bf7d6ec2b91 (diff) | |
Make wayland actually a module
Also fix so that QtCompositor can be built as shared object.
+ fix so that the default QT_WAYLAND_GL_CONFIG is wayland_egl
Change-Id: I02b72e99286584426bd37ab2d00bbc84af11efdc
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Diffstat (limited to 'examples/qwindow-compositor/surfacerenderer.h')
| -rw-r--r-- | examples/qwindow-compositor/surfacerenderer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/qwindow-compositor/surfacerenderer.h b/examples/qwindow-compositor/surfacerenderer.h index d2e03a47a..abfb554b0 100644 --- a/examples/qwindow-compositor/surfacerenderer.h +++ b/examples/qwindow-compositor/surfacerenderer.h @@ -2,7 +2,7 @@ #define SURFACERENDERER_H #include <QOpenGLContext> -#include <QGLShaderProgram> +#include <QOpenGLShaderProgram> #include <QWindow> class SurfaceRenderer @@ -18,7 +18,7 @@ private: QOpenGLContext *m_context; QWindow *m_surface; - QGLShaderProgram *m_shaderProgram; + QOpenGLShaderProgram *m_shaderProgram; QMatrix4x4 m_transformMatrix; int m_matrixLocation; |