diff options
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-4.8.7.inc | 8 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 3 |
2 files changed, 2 insertions, 9 deletions
diff --git a/meta/recipes-qt/qt4/qt4-4.8.7.inc b/meta/recipes-qt/qt4/qt4-4.8.7.inc index 67fad3ab94..5257e760e0 100644 --- 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" | |||
| 52 | FILES_${QT_BASE_NAME}-tests = "${prefix}/tests/qt4/*" | 52 | FILES_${QT_BASE_NAME}-tests = "${prefix}/tests/qt4/*" |
| 53 | 53 | ||
| 54 | do_configure_prepend() { | 54 | do_configure_prepend() { |
| 55 | for pro in $(find ${S} -name "*.pro") ; do | 55 | sed -i 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' \ |
| 56 | sed -i \ | 56 | ${S}/translations/translations.pro |
| 57 | -e 's:$$QT_BUILD_TREE/bin/lrelease:${OE_QMAKE_LRELEASE}:g' \ | ||
| 58 | -e 's:qtPrepareTool(LRELEASE, lrelease):LRELEASE = ${OE_QMAKE_LRELEASE}:g' $pro | ||
| 59 | done | ||
| 60 | 57 | ||
| 61 | sed -i s:SEDME:${S}: ${WORKDIR}/linux.conf | ||
| 62 | sed -i \ | 58 | sed -i \ |
| 63 | -e /QMAKE_MOC\ /d \ | 59 | -e /QMAKE_MOC\ /d \ |
| 64 | -e /QMAKE_UIC\ /d \ | 60 | -e /QMAKE_UIC\ /d \ |
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index f1c792b572..2058e54d3d 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
| @@ -350,9 +350,6 @@ do_install() { | |||
| 350 | -e 's#-ljscore##g' \ | 350 | -e 's#-ljscore##g' \ |
| 351 | ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc | 351 | ${D}${libdir}/*.la ${D}${libdir}/*.prl ${D}${libdir}/pkgconfig/*.pc |
| 352 | 352 | ||
| 353 | sed -i -e s#" -Wl,-rpath-link,${S}/lib"##g \ | ||
| 354 | ${D}${datadir}/${QT_DIR_NAME}/mkspecs/common/linux.conf | ||
| 355 | |||
| 356 | # fix pkgconfig files | 353 | # fix pkgconfig files |
| 357 | sed -i -e s#"moc_location=.*$"#"moc_location=${bindir}/moc4"# \ | 354 | sed -i -e s#"moc_location=.*$"#"moc_location=${bindir}/moc4"# \ |
| 358 | -e s#"uic_location=.*$"#"uic_location=${bindir}/uic4"# \ | 355 | -e s#"uic_location=.*$"#"uic_location=${bindir}/uic4"# \ |
