diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-07-05 13:11:09 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-05 05:17:36 +0200 |
| commit | 8226443b16f91aba62125c8f1e1f114cb9c1739b (patch) | |
| tree | 031ff0fcd8e7fec95980a8e7aa5e0769f969880e /src/opengl | |
| parent | 45dc5852d54bee40281095587653f0b2bd6d7e40 (diff) | |
Fixed compile of QtOpenGL on Mac & QPA.
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>
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index 4feaa83c64..4d7b6f1978 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -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 |