summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorMikko Levonmaa <mikko.levonmaa@palm.com>2013-03-06 12:20:37 -0800
committerMartin Jansa <Martin.Jansa@gmail.com>2013-05-05 12:56:34 +0200
commitbbaf26aec2f2b64c2d061ab4c81773d569d99d4e (patch)
treefcfba7b4d9405d451bedbea1d56afdb200159c14 /classes
parent92aba5ebafd80830b1ca5b3ff9ad34eea17d47cc (diff)
downloadmeta-qt5-bbaf26aec2f2b64c2d061ab4c81773d569d99d4e.tar.gz
qtbase: Find wayland-scanner correctly
* Remove silent rules for wayland-scanner Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com> Signed-off-by: Martin Jansa <martin.jansa@lge.com>
Diffstat (limited to 'classes')
-rw-r--r--classes/qmake5_base.bbclass3
1 files changed, 3 insertions, 0 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index 42c3e9ae..97faad9f 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -35,9 +35,12 @@ export OE_QMAKE_LINK = "${CXX}"
35export OE_QMAKE_LDFLAGS = "${LDFLAGS}" 35export OE_QMAKE_LDFLAGS = "${LDFLAGS}"
36export OE_QMAKE_AR = "${AR}" 36export OE_QMAKE_AR = "${AR}"
37export OE_QMAKE_STRIP = "echo" 37export OE_QMAKE_STRIP = "echo"
38export OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner"
38export QT_CONF_PATH = "${WORKDIR}/qt.conf" 39export QT_CONF_PATH = "${WORKDIR}/qt.conf"
39export QT_DIR_NAME ?= "qt5" 40export QT_DIR_NAME ?= "qt5"
40 41
42EXTRA_QMAKEVARS_PRE += "OE_QMAKE_WAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner"
43
41OE_QMAKE_PATH_PREFIX = "${prefix}" 44OE_QMAKE_PATH_PREFIX = "${prefix}"
42OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" 45OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}"
43OE_QMAKE_PATH_LIBS = "${libdir}" 46OE_QMAKE_PATH_LIBS = "${libdir}"