From 4c41a3204ef72f53813ddc86fe525fa9c6714daa Mon Sep 17 00:00:00 2001 From: Andreas Oberritter Date: Wed, 7 Mar 2012 21:36:28 +0100 Subject: qt4: fix deps in libQtWebkit.la and QtWebKit.pc * Both files contain -L../../WebCore/release -L../../JavaScriptCore/release -lwebcore -ljscore * These paths and libs don't get installed. * When building a shared lib with libtool, that links with libQtWebKit, libtool adds these unneeded parameters to the linker command-line, thus linking fails. Signed-off-by: Andreas Oberritter --- 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 75487f756..56f349a31 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com" SECTION = "x11/libs" DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" -INC_PR = "r38" +INC_PR = "r39" QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " QT_GLFLAGS_qemux86 = "-opengl" -- cgit v1.2.3