summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrevor Woerner <trevor.woerner@linaro.org>2013-09-20 03:16:06 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-10-05 14:44:24 +0200
commit5e9a9d935ac17d352cda0c8ba07b679f7a789e7a (patch)
tree721bcd02939f09d1d3046068d498b204e886c702
parentfad74f159d8a1182b89d6aeb15b1704c8886928f (diff)
downloadmeta-qt5-5e9a9d935ac17d352cda0c8ba07b679f7a789e7a.tar.gz
devshell: include PATH for qt5 native applications
If you perform a "bitbake -c devshell <some qt5 recipe>" and then try "which qmake" in the devshell, you'll find your host's qmake is found (which is most likely to be based on qt4) rather than the one that is built as part of meta-qt5. The reason for this is that the qt5 items are installed to ${STAGING_DIR_NATIVE}/usr/bin/qt5 and not ${STAGING_DIR_NATIVE}/usr/bin. The reason for the extra "qt5" directory at the end is so that qt4-based items that are built in OE can live side-by-side with things from meta-qt5 without interfering with each other. This patch prepends ${STAGING_DIR_NATIVE}/usr/bin/qt5 to the devshell's PATH so that the qt5-based native tools which are built as part of meta-qt5 will be found before the host's. Signed-off-by: Trevor Woerner <trevor.woerner@linaro.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-qt/qt5/qt5.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 87bf5e8f..24c3ae4d 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -125,3 +125,5 @@ FILES_${PN}-examples-staticdev = " \
125 ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*.a \ 125 ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*.a \
126 ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*.a \ 126 ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*.a \
127" 127"
128
129PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"