diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-10-12 16:35:04 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-13 05:51:19 +0200 |
| commit | e2217187c31833569fd8bd21ee805975597a19d7 (patch) | |
| tree | 0bd53cba484c5979650b9aab56f277366b0fbc84 /src/gui/opengl | |
| parent | ab926916d2b831979293a1a10af0ad759563913c (diff) | |
Fix warnings from syncqt.
Stop processing in internal headers, use correct include
syntax.
Change-Id: I9dcf1f6f89907986b7b58658be514083f213a3e6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
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 |
3 files changed, 4 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 |