Every recipe using Qt5 needs to know where the Qt5 tools are installed and have them in the search path.
Originally it was being done in qt5.inc file but a better place for it is inside qmake5_base.bbclass. We now use the native bindir as every recipe needs to use the native one (be it native, nativesdk or target). Signed-off-by: Otavio Salvador <[email protected]> --- classes/qmake5_base.bbclass | 3 +++ recipes-qt/qt5/qt5.inc | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 3861cd0..3b8c3bd 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -113,6 +113,9 @@ B = "${SEPB}" CONFIGURESTAMPFILE = "${WORKDIR}/qmake5_base_configure.sstate" +# The Qt5 tools binaries need to be included into the search path +PATH_prepend = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}:" + qmake5_base_preconfigure() { if [ -n "${CONFIGURESTAMPFILE}" -a -e "${CONFIGURESTAMPFILE}" ]; then if [ "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${S}" != "${B}" ]; then diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc index bb0bcdc..7b7526a 100644 --- a/recipes-qt/qt5/qt5.inc +++ b/recipes-qt/qt5/qt5.inc @@ -161,5 +161,3 @@ FILES_${PN}-examples-staticdev = " \ ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*.a \ ${OE_QMAKE_PATH_EXAMPLES}/*/*/*/*/*/*/*/*.a \ " - -PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" -- 2.0.0.rc4 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
