summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPier Luigi Fiorini <pierluigi.fiorini@gmail.com>2012-02-11 22:12:38 +0100
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>2012-02-12 13:27:03 +0100
commit962991d9228ebcd7ec986bc0dac447810c6303db (patch)
treea0b7b89e3d00a115d9ef277b0f30665d73e93720 /src
parent9d14a50e1fe167e0c7e24cbb933e758d999b809f (diff)
Fix build of compositors by always including QOpenGLContext.
QOpenGLContext is always required even when QT_COMPOSITOR_WAYLAND_GL is not defined. Moving the include outside the ifdef makes compositors build without problems. Change-Id: I4b8903b06a5f58ad8fd2953dbde1476877683cb4 Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/compositor/compositor_api/waylandsurface.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/waylandsurface.h b/src/compositor/compositor_api/waylandsurface.h
index e371237a6..834906611 100644
--- a/src/compositor/compositor_api/waylandsurface.h
+++ b/src/compositor/compositor_api/waylandsurface.h
@@ -47,8 +47,8 @@
#include <QtGui/QImage>
#include <QtCore/QVariantMap>
-#ifdef QT_COMPOSITOR_WAYLAND_GL
#include <QtGui/QOpenGLContext>
+#ifdef QT_COMPOSITOR_WAYLAND_GL
#include <QtGui/qopengl.h>
#endif