diff options
-rw-r--r-- | src/gui/kernel/qopenglcontext.h | 2 | ||||
-rw-r--r-- | src/gui/opengl/qopenglfunctions.h | 2 | ||||
-rw-r--r-- | src/opengl/qglfunctions.h | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/kernel/qopenglcontext.h b/src/gui/kernel/qopenglcontext.h index 52f94a8a10..2dc4357b00 100644 --- a/src/gui/kernel/qopenglcontext.h +++ b/src/gui/kernel/qopenglcontext.h @@ -51,9 +51,11 @@ #include <QtGui/QSurfaceFormat> #ifdef __GLEW_H__ +#if defined(Q_CC_GNU) #warning qopenglfunctions.h is not compatible with GLEW, GLEW defines will be undefined #warning To use GLEW with Qt, do not include <qopengl.h> or <QOpenGLFunctions> after glew.h #endif +#endif #include <QtGui/qopengl.h> diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h index 4e778dda66..be366a79c8 100644 --- a/src/gui/opengl/qopenglfunctions.h +++ b/src/gui/opengl/qopenglfunctions.h @@ -45,9 +45,11 @@ #ifndef QT_NO_OPENGL #ifdef __GLEW_H__ +#if defined(Q_CC_GNU) #warning qopenglfunctions.h is not compatible with GLEW, GLEW defines will be undefined #warning To use GLEW with Qt, do not include <qopengl.h> or <QOpenGLFunctions> after glew.h #endif +#endif #include <QtGui/qopengl.h> #include <QtGui/qopenglcontext.h> diff --git a/src/opengl/qglfunctions.h b/src/opengl/qglfunctions.h index da3ce7db4d..0cb0b712ba 100644 --- a/src/opengl/qglfunctions.h +++ b/src/opengl/qglfunctions.h @@ -43,9 +43,11 @@ #define QGLFUNCTIONS_H #ifdef __GLEW_H__ +#if defined(Q_CC_GNU) #warning qglfunctions.h is not compatible with GLEW, GLEW defines will be undefined #warning To use GLEW with Qt, do not include <QtOpenGL> or <QGLFunctions> after glew.h #endif +#endif #include <QtOpenGL/qgl.h> #include <QtGui/qopenglcontext.h> |