diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index 6903d3278c..031bdf3317 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -59,25 +59,26 @@ QT_BEGIN_HEADER #endif #if defined(Q_OS_MAC) +# if !defined(QT_NO_CORESERVICES) # include -#elif defined(QT_OPENGL_ES_2) -# if defined(Q_OS_MAC) -# include # else -# include +# if defined(QT_OPENGL_ES_2) +# include +# endif # endif +#elif defined(QT_OPENGL_ES_2) +# include +# else +# include +# endif + +#if defined(QT_OPENGL_ES_2) # ifndef GL_DOUBLE # define GL_DOUBLE GL_FLOAT # endif # ifndef GLdouble typedef GLfloat GLdouble; # endif -#else -# if defined(Q_OS_MAC) -# include -# else -# include -# endif #endif QT_BEGIN_NAMESPACE