diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-10 12:27:51 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-10 12:27:51 (GMT) |
| commit | 9a6bd194d403f596d66fbe8aad43550310f48eca (patch) | |
| tree | e45c15c4539d02a860aa13229df39c02fc3e09cb /mkspecs/common | |
| parent | 680182cde10be2cad5543eeef19b294836f6af97 (diff) | |
| parent | ac6323c4346be5fb5b1111194b2ee98706a69ffa (diff) | |
| download | Qt-9a6bd194d403f596d66fbe8aad43550310f48eca.zip Qt-9a6bd194d403f596d66fbe8aad43550310f48eca.tar.gz Qt-9a6bd194d403f596d66fbe8aad43550310f48eca.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:
Replace gluPerspective with qgluPerspective.
Remove dependency of OpenGL Utility Library (GLU).
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/linux.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf index 4fbe2dc..e443be1 100644 --- a/mkspecs/common/linux.conf +++ b/mkspecs/common/linux.conf @@ -28,7 +28,7 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11SM = -lSM -lICE QMAKE_LIBS_NIS = -lnsl QMAKE_LIBS_EGL = -lEGL -QMAKE_LIBS_OPENGL = -lGLU -lGL +QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 |