diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-11 09:12:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-11 09:12:42 (GMT) |
| commit | ef0d191e3d138f695a39128b6040d0884821f5b5 (patch) | |
| tree | 7da6eae795f07d631a33940e7481f38c40444e28 /mkspecs/aix-g++-64 | |
| parent | d181197c41be617fbc2243d376e20f4a95b944f7 (diff) | |
| parent | 1023209b9c335d72dc489d67e632d80cadac924d (diff) | |
| download | Qt-ef0d191e3d138f695a39128b6040d0884821f5b5.zip Qt-ef0d191e3d138f695a39128b6040d0884821f5b5.tar.gz Qt-ef0d191e3d138f695a39128b6040d0884821f5b5.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:
Fix build os QSharedPointer on MSVC
Fix for QTBUG-2182: "connection still in use" warnings.
Replace gluOrtho2d with glOrtho.
Optimize QSharedPointer::operator=(const QSharedPointer &)
Make selection work across ligatures
Fix compilation on 64-bit Windows.
Fix documentation for QAccessible::InterfaceFactory
Replace gluPerspective with qgluPerspective.
Remove dependency of OpenGL Utility Library (GLU).
Diffstat (limited to 'mkspecs/aix-g++-64')
| -rw-r--r-- | mkspecs/aix-g++-64/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/aix-g++-64/qmake.conf b/mkspecs/aix-g++-64/qmake.conf index d9d9c38..b0179d5 100644 --- a/mkspecs/aix-g++-64/qmake.conf +++ b/mkspecs/aix-g++-64/qmake.conf @@ -63,7 +63,7 @@ QMAKE_LIBS = QMAKE_LIBS_DYNLOAD = -ldl QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_X11SM = -lSM -lICE -QMAKE_LIBS_OPENGL = -lGLU -lGL +QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_OPENGL_QT = -lGL QMAKE_LIBS_THREAD = -lpthreads |