diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-05 12:06:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-05 12:06:15 (GMT) |
| commit | ddc9b0562de4a14d83a6f057a405171392372450 (patch) | |
| tree | 986b80b5df8a00c5800b35fd5720d636b4c15e87 | |
| parent | 84b5bbc77045cdc267626ff86f309664283abed4 (diff) | |
| parent | 17e6529f7ff18c6f47f1fcc35379addd78d7156e (diff) | |
| download | Qt-ddc9b0562de4a14d83a6f057a405171392372450.zip Qt-ddc9b0562de4a14d83a6f057a405171392372450.tar.gz Qt-ddc9b0562de4a14d83a6f057a405171392372450.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Added warning if <QGLFunctions> is included when GLEW is present.
| -rw-r--r-- | dist/changes-4.8.0 | 2 | ||||
| -rw-r--r-- | src/opengl/qglfunctions.h | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/dist/changes-4.8.0 b/dist/changes-4.8.0 index c55faf6..fa50f24 100644 --- a/dist/changes-4.8.0 +++ b/dist/changes-4.8.0 @@ -51,6 +51,8 @@ QtGui - Removed dependency of OpenGL Utility Library (GLU) - Added QGLFunctions, which provides cross-platform access to the OpenGL/ES 2.0 API. + - Including <QtOpenGL> will not work in combination with GLEW, as + QGLFunctions will undefine GLEW's defines. **************************************************************************** diff --git a/src/opengl/qglfunctions.h b/src/opengl/qglfunctions.h index e06de7f..88f43c0 100644 --- a/src/opengl/qglfunctions.h +++ b/src/opengl/qglfunctions.h @@ -42,6 +42,11 @@ #ifndef QGLFUNCTIONS_H #define QGLFUNCTIONS_H +#ifdef __GLEW_H__ +#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 + #include <QtOpenGL/qgl.h> QT_BEGIN_HEADER |