diff options
-rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded.inc | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index bee7345ff0..c4f6e980d1 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc | |||
@@ -3,7 +3,7 @@ SECTION = "libs" | |||
3 | LICENSE = "LGPLv2.1 | GPLv3" | 3 | LICENSE = "LGPLv2.1 | GPLv3" |
4 | HOMEPAGE = "http://qt.nokia.com" | 4 | HOMEPAGE = "http://qt.nokia.com" |
5 | DEPENDS += "directfb tslib" | 5 | DEPENDS += "directfb tslib" |
6 | INC_PR = "r36" | 6 | INC_PR = "r37" |
7 | 7 | ||
8 | QT_BASE_NAME ?= "qt4-embedded" | 8 | QT_BASE_NAME ?= "qt4-embedded" |
9 | QT_BASE_LIB ?= "libqt-embedded" | 9 | QT_BASE_LIB ?= "libqt-embedded" |
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" | |||
5 | SECTION = "x11/libs" | 5 | SECTION = "x11/libs" |
6 | DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" | 6 | DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" |
7 | 7 | ||
8 | INC_PR = "r33" | 8 | INC_PR = "r34" |
9 | 9 | ||
10 | QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " | 10 | QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " |
11 | QT_GLFLAGS_qemux86 = "-opengl" | 11 | QT_GLFLAGS_qemux86 = "-opengl" |
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 4dc9a75e57..bec81b4645 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
@@ -294,13 +294,13 @@ do_install() { | |||
294 | rm -f ${D}/${bindir}/lrelease | 294 | rm -f ${D}/${bindir}/lrelease |
295 | 295 | ||
296 | # fix pkgconfig, libtool and prl files | 296 | # fix pkgconfig, libtool and prl files |
297 | sed -i -e s#-L${S}/lib/\?##g \ | 297 | sed -i -e 's#-L${S}/lib/\?##g' \ |
298 | -e s#-L${STAGING_LIBDIR}/\?##g \ | 298 | -e 's#-L${STAGING_LIBDIR}/\?##g' \ |
299 | -e 's#STAGING_LIBDIR}#libdir}'#g \ | 299 | -e 's#STAGING_LIBDIR}#libdir}'#g \ |
300 | -e s#-L${libdir}/\?##g \ | 300 | -e 's#-L${libdir}/\?##g' \ |
301 | -e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \ | 301 | -e s#'$(OE_QMAKE_LIBS_X11)'#"${OE_QMAKE_LIBS_X11}"#g \ |
302 | -e s#" -Wl,-rpath-link,${S}/lib/\?"##g \ | 302 | -e 's#" -Wl,-rpath-link,${S}/lib/\?"##g' \ |
303 | -e s#" -Wl,-rpath-link,${libdir}/\?"##g \ | 303 | -e 's#" -Wl,-rpath-link,${libdir}/\?"##g' \ |
304 | -e 's#Iin#I${in#g' \ | 304 | -e 's#Iin#I${in#g' \ |
305 | ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc | 305 | ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc |
306 | 306 | ||