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>bb10
parent
11e8138495
commit
a068e707af
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue