From a068e707afba5e5b9ba5f1990140dc2e78eaccec Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Thu, 17 Nov 2011 17:39:52 +1000
Subject: Fixed compile of QtGui with -qtnamespace.

GL headers should not be included inside of the Qt namespace.

Change-Id: Ib19cbd3ab7b071a96e0816798f8ebc3fd4e28448
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
---
 src/gui/opengl/qopengl.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/gui/opengl')

diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h
index bc24d2fda6..cc64804efd 100644
--- a/src/gui/opengl/qopengl.h
+++ b/src/gui/opengl/qopengl.h
@@ -46,10 +46,6 @@
 
 QT_BEGIN_HEADER
 
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Gui)
-
 #if 1
 #if defined(QT_OPENGL_ES_2)
 # if defined(Q_OS_MAC)
@@ -75,6 +71,10 @@ typedef GLfloat GLdouble;
 #endif
 #endif
 
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Gui)
+
 QT_END_NAMESPACE
 
 QT_END_HEADER
-- 
cgit v1.2.3