diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-01-10 14:11:52 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2011-01-10 14:11:52 (GMT) |
| commit | 44afade51254de33a0f31baf39034af0eb73842f (patch) | |
| tree | cd9c75a8d37be58a5022a545aa939eff9e196730 /src/opengl/qglfunctions.h | |
| parent | 3263f8036128cc4403cf6383324f5390eecee13b (diff) | |
| parent | 2bddf15b87a9e27bfdcbc3aec5d79da49f070c15 (diff) | |
| download | Qt-44afade51254de33a0f31baf39034af0eb73842f.zip Qt-44afade51254de33a0f31baf39034af0eb73842f.tar.gz Qt-44afade51254de33a0f31baf39034af0eb73842f.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/opengl/qglfunctions.h')
| -rw-r--r-- | src/opengl/qglfunctions.h | 5 |
1 files changed, 5 insertions, 0 deletions
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 |