summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-x11-free.inc
diff options
context:
space:
mode:
authorPhilip Balister <philip@balister.org>2011-12-12 18:48:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-13 12:28:12 +0000
commit23f1ede0a175bed2bf6c3bfee4237852c186359a (patch)
treed6becd65603e8d2845cfad1efd811474587b101c /meta/recipes-qt/qt4/qt4-x11-free.inc
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/qt4/qt4-x11-free.inc')
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 53a44ad691..5b93a984f2 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"