From 962991d9228ebcd7ec986bc0dac447810c6303db Mon Sep 17 00:00:00 2001
From: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Date: Sat, 11 Feb 2012 22:12:38 +0100
Subject: 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>
---
 src/compositor/compositor_api/waylandsurface.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compositor/compositor_api/waylandsurface.h b/src/compositor/compositor_api/waylandsurface.h
index e371237a..83490661 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
 
-- 
cgit v1.2.1