diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-11-17 17:39:52 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-17 11:48:09 +0100 |
| commit | a068e707afba5e5b9ba5f1990140dc2e78eaccec (patch) | |
| tree | 659200d8f502a3d25ef008f54ab41551de9a13f5 /src/gui/opengl | |
| parent | 11e813849558de168829bc9a8af3a924f5496ab7 (diff) | |
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>
Diffstat (limited to 'src/gui/opengl')
| -rw-r--r-- | src/gui/opengl/qopengl.h | 8 |
1 files changed, 4 insertions, 4 deletions
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 |