summaryrefslogtreecommitdiff
path: root/meta/recipes-qt/qt4/qt4-x11-free.inc
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2011-11-29 11:47:05 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-29 13:43:34 +0000
commit2e635b4fe6be9d5bfcdd837a523833b7eb0819a0 (patch)
tree51574433ce864a54ad112fbd49d031948a6d832e /meta/recipes-qt/qt4/qt4-x11-free.inc
parent6912bd212cf91ead4c5f8c4e4bb86ceb15e414e1 (diff)
downloadopenembedded-core-2e635b4fe6be9d5bfcdd837a523833b7eb0819a0.tar.gz
openembedded-core-2e635b4fe6be9d5bfcdd837a523833b7eb0819a0.tar.bz2
openembedded-core-2e635b4fe6be9d5bfcdd837a523833b7eb0819a0.zip
qt4: fix sed to have correct *.pc files
it seems sed doesn't handle \? properly if the string in not between quotes. without this patch, we get something like (for example for QtDBusE.pc : Libs: -L${libdir} -lQtDBusE Libs.private: -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board/ usr/lib -L/usr/lib -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board /usr/lib -lQtXmlE -L/usr/lib -lQtCoreE -lpthread Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir} with the patch we get what is expected : Libs: -L${libdir} -lQtDBusE Libs.private: -lQtXmlE -lQtCoreE -lpthread Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir} Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-x11-free.inc')
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 04b788560a..029c61e447 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 = "r33"
+INC_PR = "r34"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"