qt4.inc : Add uic, moc, rcc, and lrelease to tools package.

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.

Tested by building gnuradio on the USRP e100 with qt support.

(This effectively reverses OE-core rev
69eeb3d2276e5b10d084b47d308ecfc8daf8b467, however test builds for
qemux86 and qemumips produced no packaging warnings such as those
described in that commit, and the architecture of the executables is
correct.)

Signed-off-by: Philip Balister <philip@balister.org>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 06b2432585c90bf57c4745d53b7661d4836742a8..39f7398f53e19ef1309ae0009ef2f733c9edcaaa 100644 (file)
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
 SECTION = "libs"
 HOMEPAGE = "http://qt.nokia.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r38"
+INC_PR = "r39"
 
 QT_BASE_NAME ?= "qt4-embedded"
 QT_BASE_LIB  ?= "libqt-embedded"

diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 53a44ad6917e9dad48f2d221cb4e386ec97cf89f..5b93a984f2b82eb966a9fdbe59066c04f1bcbed1 100644 (file)
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
 SECTION = "x11/libs"
 DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
 
-INC_PR = "r35"
+INC_PR = "r36"
 
 QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
 QT_GLFLAGS_qemux86 = "-opengl"

diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 3155cbb6df4cae400f7befd4ff42db9fd0f04bf9..87a12e6607fec942afc99dbc457f51b471cae2a0 100644 (file)
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -142,8 +142,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"
@@ -291,11 +291,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' \