From f4188229f100349f4c88340b62a37d3ebfe51cc5 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Fri, 20 Sep 2013 03:16:06 +0000 Subject: [PATCH] devshell: include PATH for qt5 native applications If you perform a "bitbake -c devshell " 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 Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index a9d3000cb9..f1fd9517f8 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -132,3 +132,5 @@ FILES_${PN}-examples-staticdev = " \ ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*.a \ ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*.a \ " + +PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:"