1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed compile of QtGui with -qtnamespace.

Browse Source 
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>
This commit is contained in:
Rohan McGovern 2011-11-17 17:39:52 +10:00 committed by Qt by Nokia
parent 11e8138495
commit a068e707af
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/opengl/qopengl.h
View File

@ -46,10 +46,6 @@
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
QT_MODULE(Gui)
#if 1 #if 1
#if defined(QT_OPENGL_ES_2) #if defined(QT_OPENGL_ES_2)
# if defined(Q_OS_MAC) # if defined(Q_OS_MAC)
@ -75,6 +71,10 @@ typedef GLfloat GLdouble;
#endif #endif
#endif #endif
QT_BEGIN_NAMESPACE
QT_MODULE(Gui)
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER