From 7ee2410825cb30b7f073c69d8c32a498835f0eec Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 6 Nov 2012 00:36:47 +0100 Subject: qt4: remove -lGLU from QMAKE_LIBS_OPENGL in our linux.conf upstream does not need GLU since: commit e7eed096a0c33607a7a37baaf06e5952dc9d556b Author: Bjrn Erik Nilsen 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 (From OE-Core rev: 181874ba8033535bb4ce2b36725ae0a71c27b3bd) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/recipes-qt/qt4/qt4-x11-free.inc') diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 20ad30c579..a50b0c7760 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc @@ -7,7 +7,7 @@ DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender li PROVIDES += "qt4-x11" QT4DEPENDS = "" -INC_PR = "r47" +INC_PR = "r48" QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " QT_GLFLAGS_qemux86 = "-opengl" -- cgit v1.2.3-54-g00ecf