diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2010-08-09 12:07:01 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2010-08-10 09:31:49 (GMT) |
| commit | e7eed096a0c33607a7a37baaf06e5952dc9d556b (patch) | |
| tree | d14165030715bc3fe9be43adac48d8ab43cb122e /config.tests/x11 | |
| parent | 3af33f5eddb3624654141b3f7b0cbb9a49e94438 (diff) | |
| download | Qt-e7eed096a0c33607a7a37baaf06e5952dc9d556b.zip Qt-e7eed096a0c33607a7a37baaf06e5952dc9d556b.tar.gz Qt-e7eed096a0c33607a7a37baaf06e5952dc9d556b.tar.bz2 | |
Remove dependency of OpenGL Utility Library (GLU).
GLU is not part of standard OpenGL and is not used internally in Qt,
so we should not depend on it.
Task-number: QT-12227
Reviewed-by: kim
Diffstat (limited to 'config.tests/x11')
| -rw-r--r-- | config.tests/x11/glxfbconfig/glxfbconfig.pro | 2 | ||||
| -rw-r--r-- | config.tests/x11/opengl/opengl.cpp | 5 | ||||
| -rw-r--r-- | config.tests/x11/opengl/opengl.pro | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/config.tests/x11/glxfbconfig/glxfbconfig.pro b/config.tests/x11/glxfbconfig/glxfbconfig.pro index 4705ca6..65f855a 100644 --- a/config.tests/x11/glxfbconfig/glxfbconfig.pro +++ b/config.tests/x11/glxfbconfig/glxfbconfig.pro @@ -7,4 +7,4 @@ for(p, QMAKE_LIBDIR_OPENGL) { } CONFIG -= qt -LIBS += -lGL -lGLU +LIBS += -lGL diff --git a/config.tests/x11/opengl/opengl.cpp b/config.tests/x11/opengl/opengl.cpp index 3802365..6c1815d 100644 --- a/config.tests/x11/opengl/opengl.cpp +++ b/config.tests/x11/opengl/opengl.cpp @@ -40,11 +40,6 @@ ****************************************************************************/ #include <GL/gl.h> -#include <GL/glu.h> - -#ifndef GLU_VERSION_1_2 -# error "Required GLU version 1.2 not found." -#endif int main(int, char **) { diff --git a/config.tests/x11/opengl/opengl.pro b/config.tests/x11/opengl/opengl.pro index 5fd41d3..5c3a1c5 100644 --- a/config.tests/x11/opengl/opengl.pro +++ b/config.tests/x11/opengl/opengl.pro @@ -8,4 +8,4 @@ for(p, QMAKE_LIBDIR_OPENGL) { CONFIG -= qt win32-g++*:LIBS += -lopengl32 -else:LIBS += -lGL -lGLU +else:LIBS += -lGL |