summaryrefslogtreecommitdiff
path: root/meta/recipes-qt/qt4/qt4-4.8.3
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-11-06 00:36:47 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-12 12:42:51 +0000
commit181874ba8033535bb4ce2b36725ae0a71c27b3bd (patch)
tree7db8d74ffb7a6bec58d47f809b758f4b508f35fd /meta/recipes-qt/qt4/qt4-4.8.3
parent1b0d9cb1801a8eb68c82dfcda5a1da420ac8dd83 (diff)
downloadopenembedded-core-181874ba8033535bb4ce2b36725ae0a71c27b3bd.tar.gz
openembedded-core-181874ba8033535bb4ce2b36725ae0a71c27b3bd.tar.bz2
openembedded-core-181874ba8033535bb4ce2b36725ae0a71c27b3bd.zip
qt4: remove -lGLU from QMAKE_LIBS_OPENGL in our linux.conf
upstream does not need GLU since: commit e7eed096a0c33607a7a37baaf06e5952dc9d556b Author: Bj<C3><B8>rn Erik Nilsen <bjorn.nilsen@nokia.com> Date: Mon Aug 9 14:07:01 2010 +0200 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 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-4.8.3')
-rw-r--r--meta/recipes-qt/qt4/qt4-4.8.3/linux.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.3/linux.conf b/meta/recipes-qt/qt4/qt4-4.8.3/linux.conf
index a54135513b..86703813ca 100644
--- a/meta/recipes-qt/qt4/qt4-4.8.3/linux.conf
+++ b/meta/recipes-qt/qt4/qt4-4.8.3/linux.conf
@@ -29,7 +29,7 @@ QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
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