From: Jørgen Lind <jorgen.lind@nokia.com>
Date: Wed, 4 Jan 2012 07:19:54 +0000 (+0100)
Subject: Remove QtOpenGL includes
X-Git-Tag: qt-v5.0.0-alpha1~134
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=107be565ab3aa4d7c2c82e4094824e0783ecbcbe;p=profile%2Fivi%2Fqtwayland.git

Remove QtOpenGL includes

Change-Id: I66c4c98b308bd97760ad2db720785ee64fc64959
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
---

diff --git a/src/compositor/hardware_integration/graphicshardwareintegration.h b/src/compositor/hardware_integration/graphicshardwareintegration.h
index 9f1f409..42530f5 100644
--- a/src/compositor/hardware_integration/graphicshardwareintegration.h
+++ b/src/compositor/hardware_integration/graphicshardwareintegration.h
@@ -41,7 +41,8 @@
 #ifndef GRAPHICSHARDWAREINTEGRATION_H
 #define GRAPHICSHARDWAREINTEGRATION_H
 
-#include <QtOpenGL/qgl.h>
+#include <QtGui/qopengl.h>
+#include <QtGui/QOpenGLContext>
 #include <wayland-server.h>
 
 #include "waylandcompositor.h"
diff --git a/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp b/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp
index c03e8a9..3841bef 100644
--- a/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/readback_egl/qwaylandreadbackeglcontext.cpp
@@ -46,9 +46,6 @@
 #include <QtCore/QDebug>
 #include <QtGui/QWindowContext>
 
-#include <QtOpenGL/QGLContext>
-#include <QtOpenGL/private/qglextensions_p.h>
-
 #include "qwaylandshmsurface.h"