diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-16 10:43:36 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2012-10-16 10:46:48 +0200 |
commit | 8fc4f99e468a279e6bb8442adad6b6a46d1be1c3 (patch) | |
tree | dfd0540ecac0bc86594e9e997d7e979e40dacc6d /src/gui/opengl | |
parent | d3921cce47f834dd37cf0bb4085ba242dbbe2412 (diff) | |
parent | f7241e8cb949ecf2d86fae2a759a8e1fdb148a26 (diff) |
Merge remote-tracking branch 'gerrit/master' into newdocs
Change-Id: If2168c519daf45390af04af9ef9722770453a493
Diffstat (limited to 'src/gui/opengl')
-rw-r--r-- | src/gui/opengl/qopengl.h | 4 | ||||
-rw-r--r-- | src/gui/opengl/qopengles2ext.h | 1 | ||||
-rw-r--r-- | src/gui/opengl/qopenglext.h | 1 | ||||
-rw-r--r-- | src/gui/opengl/qopenglfunctions.h | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h index 291c23b85f..5928b0be2f 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -63,7 +63,7 @@ QT_BEGIN_HEADER */ typedef char GLchar; -# include "qopengles2ext.h" +# include <QtGui/qopengles2ext.h> # ifndef GL_DOUBLE # define GL_DOUBLE GL_FLOAT # endif @@ -96,7 +96,7 @@ typedef GLfloat GLdouble; # include <QtCore/qt_windows.h> # endif # include <GL/gl.h> -# include "qopenglext.h" +# include <QtGui/qopenglext.h> # endif // Q_OS_MAC #endif diff --git a/src/gui/opengl/qopengles2ext.h b/src/gui/opengl/qopengles2ext.h index 564bbc8484..61bfb595cc 100644 --- a/src/gui/opengl/qopengles2ext.h +++ b/src/gui/opengl/qopengles2ext.h @@ -3,6 +3,7 @@ #if 0 #pragma qt_no_master_include +#pragma qt_sync_stop_processing #endif /* $Revision: 18481 $ on $Date:: 2012-07-11 18:07:26 -0700 #$ */ diff --git a/src/gui/opengl/qopenglext.h b/src/gui/opengl/qopenglext.h index 070dd993d9..5d21cb6eea 100644 --- a/src/gui/opengl/qopenglext.h +++ b/src/gui/opengl/qopenglext.h @@ -3,6 +3,7 @@ #if 0 #pragma qt_no_master_include +#pragma qt_sync_stop_processing #endif #ifdef __cplusplus diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h index 54633ff208..f035e26d81 100644 --- a/src/gui/opengl/qopenglfunctions.h +++ b/src/gui/opengl/qopenglfunctions.h @@ -83,6 +83,8 @@ typedef ptrdiff_t qopengl_GLsizeiptr; #if defined(APIENTRY) && !defined(QOPENGLF_APIENTRY) # define QOPENGLF_APIENTRY APIENTRY +#elif defined(GL_APIENTRY) && !defined(QOPENGLF_APIENTRY) +# define QOPENGLF_APIENTRY GL_APIENTRY #endif # ifndef QOPENGLF_APIENTRYP |