diff options
Diffstat (limited to 'meta/recipes-qt/qt4/qt4.inc')
-rw-r--r-- | 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 3155cbb6df..87a12e6607 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
@@ -142,8 +142,8 @@ RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += " \ | |||
142 | RRECOMMENDS_${QT_BASE_NAME}-doc += " \ | 142 | RRECOMMENDS_${QT_BASE_NAME}-doc += " \ |
143 | ${QT_BASE_NAME}-demos-doc" | 143 | ${QT_BASE_NAME}-demos-doc" |
144 | 144 | ||
145 | FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc*" | 145 | FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc* ${bindir}/moc ${bindir}/uic* ${bindir}/rcc" |
146 | FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc*" | 146 | FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc* ${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc" |
147 | FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator" | 147 | FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator" |
148 | FILES_${QT_BASE_NAME}-assistant-dbg = "${bindir}/.debug/*assistant* ${bindir}/.debug/qcollectiongenerator ${bindir}/.debug/qhelpconverter ${bindir}/.debug/qhelpgenerator" | 148 | FILES_${QT_BASE_NAME}-assistant-dbg = "${bindir}/.debug/*assistant* ${bindir}/.debug/qcollectiongenerator ${bindir}/.debug/qhelpconverter ${bindir}/.debug/qhelpgenerator" |
149 | FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig" | 149 | FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig" |
@@ -291,11 +291,6 @@ do_install() { | |||
291 | 291 | ||
292 | # These are host binaries, we should only use them in staging | 292 | # These are host binaries, we should only use them in staging |
293 | rm ${D}/${bindir}/qmake | 293 | rm ${D}/${bindir}/qmake |
294 | rm -f ${D}/${bindir}/uic | ||
295 | rm -f ${D}/${bindir}/uic3 | ||
296 | rm ${D}/${bindir}/moc | ||
297 | rm ${D}/${bindir}/rcc | ||
298 | rm -f ${D}/${bindir}/lrelease | ||
299 | 294 | ||
300 | # fix pkgconfig, libtool and prl files | 295 | # fix pkgconfig, libtool and prl files |
301 | sed -i -e 's#-L${S}/lib/\?##g' \ | 296 | sed -i -e 's#-L${S}/lib/\?##g' \ |