[OE-core] [PATCH 2/2] qt4.inc : Add uic, moc, rcc, and lrelease to tools package.
Philip Balister
philip at balister.org
Wed Dec 7 15:59:28 UTC 2011
These binaries are needed in the target tools package so we can build
qt apps on the target. You also need to install qmake from meta-oe.
Test by building gnuradio on the USRP e100 with qt support.
Signed-off-by: Philip Balister <philip at balister.org>
---
meta/recipes-qt/qt4/qt4.inc | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index bec81b4..2638249 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -138,8 +138,8 @@ RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += " \
RRECOMMENDS_${QT_BASE_NAME}-doc += " \
${QT_BASE_NAME}-demos-doc"
-FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc*"
-FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc*"
+FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc* ${bindir}/moc ${bindir}/uic* ${bindir}/rcc"
+FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc* ${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc"
FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator"
FILES_${QT_BASE_NAME}-assistant-dbg = "${bindir}/.debug/*assistant* ${bindir}/.debug/qcollectiongenerator ${bindir}/.debug/qhelpconverter ${bindir}/.debug/qhelpgenerator"
FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig"
@@ -287,11 +287,6 @@ do_install() {
# These are host binaries, we should only use them in staging
rm ${D}/${bindir}/qmake
- rm -f ${D}/${bindir}/uic
- rm -f ${D}/${bindir}/uic3
- rm ${D}/${bindir}/moc
- rm ${D}/${bindir}/rcc
- rm -f ${D}/${bindir}/lrelease
# fix pkgconfig, libtool and prl files
sed -i -e 's#-L${S}/lib/\?##g' \
--
1.7.3.4
More information about the Openembedded-core
mailing list