summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
diff options
context:
space:
mode:
authorPhilip Balister <philip@balister.org>2011-12-12 18:48:34 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-13 12:28:12 (GMT)
commit23f1ede0a175bed2bf6c3bfee4237852c186359a (patch)
treed6becd65603e8d2845cfad1efd811474587b101c /meta/recipes-qt
parentcf008856691b2ed8bd1707183bafccd94da911ae (diff)
downloadpoky-23f1ede0a175bed2bf6c3bfee4237852c186359a.tar.gz
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.) (From OE-Core rev: c96db08915a554fb5e4bb2c360b919c8392b32c6) 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>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4.inc9
3 files changed, 4 insertions, 9 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 06b2432..39f7398 100644
--- 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
2SECTION = "libs" 2SECTION = "libs"
3HOMEPAGE = "http://qt.nokia.com" 3HOMEPAGE = "http://qt.nokia.com"
4DEPENDS += "directfb tslib" 4DEPENDS += "directfb tslib"
5INC_PR = "r38" 5INC_PR = "r39"
6 6
7QT_BASE_NAME ?= "qt4-embedded" 7QT_BASE_NAME ?= "qt4-embedded"
8QT_BASE_LIB ?= "libqt-embedded" 8QT_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 53a44ad..5b93a98 100644
--- 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"
5SECTION = "x11/libs" 5SECTION = "x11/libs"
6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" 6DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
7 7
8INC_PR = "r35" 8INC_PR = "r36"
9 9
10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " 10QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
11QT_GLFLAGS_qemux86 = "-opengl" 11QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 3155cbb..87a12e6 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -142,8 +142,8 @@ RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += " \
142RRECOMMENDS_${QT_BASE_NAME}-doc += " \ 142RRECOMMENDS_${QT_BASE_NAME}-doc += " \
143 ${QT_BASE_NAME}-demos-doc" 143 ${QT_BASE_NAME}-demos-doc"
144 144
145FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc*" 145FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc* ${bindir}/moc ${bindir}/uic* ${bindir}/rcc"
146FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc*" 146FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc* ${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc"
147FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator" 147FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator"
148FILES_${QT_BASE_NAME}-assistant-dbg = "${bindir}/.debug/*assistant* ${bindir}/.debug/qcollectiongenerator ${bindir}/.debug/qhelpconverter ${bindir}/.debug/qhelpgenerator" 148FILES_${QT_BASE_NAME}-assistant-dbg = "${bindir}/.debug/*assistant* ${bindir}/.debug/qcollectiongenerator ${bindir}/.debug/qhelpconverter ${bindir}/.debug/qhelpgenerator"
149FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig" 149FILES_${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' \