projects / profile / ivi / qtwayland.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9d14a50)
Fix build of compositors by always including QOpenGLContext.
authorPier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Sat, 11 Feb 2012 21:12:38 +0000 (22:12 +0100)
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>
Sun, 12 Feb 2012 12:27:03 +0000 (13:27 +0100)
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>
src/compositor/compositor_api/waylandsurface.h patch | blob | history

diff --git a/src/compositor/compositor_api/waylandsurface.h b/src/compositor/compositor_api/waylandsurface.h
index e371237..8349066 100644 (file)
--- 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
 
Domain: Graphics System / Display Server;