qt4: fixes for sed command

* There is no $$QT_BUILD_TREE/bin/lrelease in any .pro file, so remove
  the sed command.
* Only translations/translations.pro has "qtPrepareTool(LRELEASE", so
  use the file name directly rather than find all the .pro files.
* The SEDME in linux.conf had been gone in 2010, and no
  '-Wl,-rpath-link' in linux.conf either, so remove the sed commands.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-qt/qt4/qt4-4.8.7.inc b/meta/recipes-qt/qt4/qt4-4.8.7.inc
index 67fad3ab942b755297101d91b551b768a399997e..5257e760e057c35e05d263c9309f0984f255296f 100644 (file)
--- a/meta/recipes-qt/qt4/qt4-4.8.7.inc
+++ b/meta/recipes-qt/qt4/qt4-4.8.7.inc
@@ -52,13 +52,9 @@ FILES_${QT_BASE_NAME}-tests-dbg        = "${prefix}/tests/qt4/*/.debug"
 FILES_${QT_BASE_NAME}-tests            = "${prefix}/tests/qt4/*"
 
 do_configure_prepend() {
-    for pro in $(find ${S} -name "*.pro") ; do
-        sed -i \
-            -e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \
-            -e 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' $pro
-    done
+    sed -i 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' \
+        ${S}/translations/translations.pro
 
-    sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf
     sed -i \
     -e /QMAKE_MOC\ /d \
     -e /QMAKE_UIC\ /d \

diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index f1c792b5721c2ce09272e814100e72df76aa55fa..2058e54d3d30f2367dfc8de7ff120f27c6816a2b 100644 (file)
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -350,9 +350,6 @@ do_install() {
                        -e 's#-ljscore##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"# \