diff options
| -rw-r--r-- | recipes/qt4/qt-4.6.2.inc | 1 | ||||
| -rw-r--r-- | recipes/qt4/qt4-embedded.inc | 2 | ||||
| -rw-r--r-- | recipes/qt4/qt4-x11-free.inc | 2 | ||||
| -rw-r--r-- | recipes/qt4/qt4.inc | 3 |
4 files changed, 6 insertions, 2 deletions
diff --git a/recipes/qt4/qt-4.6.2.inc b/recipes/qt4/qt-4.6.2.inc index 94777e5d04..89242bbaee 100644 --- a/recipes/qt4/qt-4.6.2.inc +++ b/recipes/qt4/qt-4.6.2.inc @@ -11,6 +11,7 @@ SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}. file://0009-support-2bpp.patch;patch=1 \ file://0010-no-simpledecoration-example.patch;patch=1 \ file://fix-config-tests.patch;patch=1 \ + file://qt-config.patch;patch=1 \ file://g++.conf \ file://linux.conf \ " diff --git a/recipes/qt4/qt4-embedded.inc b/recipes/qt4/qt4-embedded.inc index 39a5e98ca5..7e0be6e955 100644 --- a/recipes/qt4/qt4-embedded.inc +++ b/recipes/qt4/qt4-embedded.inc @@ -4,7 +4,7 @@ LICENSE = "GPL QPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS += "directfb tslib" -INC_PR = "r17" +INC_PR = "r18" QT_BASE_NAME ?= "qt4-embedded" QT_BASE_LIB ?= "libqt-embedded" diff --git a/recipes/qt4/qt4-x11-free.inc b/recipes/qt4/qt4-x11-free.inc index fd33a21787..d8dfa5c225 100644 --- a/recipes/qt4/qt4-x11-free.inc +++ b/recipes/qt4/qt4-x11-free.inc @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.trolltech.com" LICENSE = "GPL QPL" DEPENDS += "virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor" -INC_PR = "r16" +INC_PR = "r17" SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \ file://0001-cross-compile.patch;patch=1 \ diff --git a/recipes/qt4/qt4.inc b/recipes/qt4/qt4.inc index 14b0a960df..861b38d7cf 100644 --- a/recipes/qt4/qt4.inc +++ b/recipes/qt4/qt4.inc @@ -252,6 +252,9 @@ do_install() { -e 's#Iin#I${in#g' \ ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc + sed -i -e s#" -Wl,-rpath-link,${S}/lib"##g \ + ${D}${datadir}/${QT_DIR_NAME}/mkspecs/common/linux.conf + # fix pkgconfig files sed -i -e s#"moc_location=.*$"#"moc_location=${bindir}/moc4"# \ -e s#"uic_location=.*$"#"uic_location=${bindir}/uic4"# \ |