AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed compile of QtOpenGL on Mac & QPA.

Browse Source 
Replace a Q_WS_MAC test (which is not true for Mac & QPA) with Q_OS_MAC
(which is always true on Mac).

Change-Id: Ie3d12bae233d44b3607f4c57a0c65059d0d6ccb9
Reviewed-on: http://codereview.qt.nokia.com/1129
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
This commit is contained in:
Rohan McGovern 2011-07-05 13:11:09 +10:00 committed by Qt by Nokia
parent 45dc5852d5
commit 8226443b16
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/opengl/qgl.h
View File

@ -58,9 +58,7 @@ QT_BEGIN_HEADER
# include <QtCore/qt_windows.h>
#endif
#if defined(Q_WS_MAC)
# include <OpenGL/gl.h>
#elif defined(QT_OPENGL_ES_1)
#if defined(QT_OPENGL_ES_1)
# if defined(Q_OS_MAC)
# include <OpenGLES/ES1/gl.h>
# else
@ -85,7 +83,11 @@ typedef GLfloat GLdouble;
typedef GLfloat GLdouble;
# endif
#else
# include <GL/gl.h>
# if defined(Q_OS_MAC)
# include <OpenGL/gl.h>
# else
# include <GL/gl.h>
# endif
#endif
QT_BEGIN_NAMESPACE