From 545bebca0722c21c4cd61c47260202bda20f2db4 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 26 Sep 2017 13:15:00 +0300 Subject: qtquickcompiler: fix path for QT_HOST_BINS Bitbake builds need to use QT_HOST_BINS/get for getting the correct path to the host tools. Change it for qtquickcompiler.prf so that project can use CONFIG+=qtquickcompiler without need to have CONFIG+=no_qtquickcompiler_depend as well. Change-Id: I5196e06f249531833fccca6b0b6a213016270ab6 Reviewed-by: Mikko Gronoff --- classes/qtquickcompiler.bbclass | 2 +- recipes-qt/qt5-addons/qtquickcompiler-sdk.bb | 3 +++ recipes-qt/qt5/qtquickcompiler_git.bb | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/classes/qtquickcompiler.bbclass b/classes/qtquickcompiler.bbclass index c36e4c4..3a1bcbe 100644 --- a/classes/qtquickcompiler.bbclass +++ b/classes/qtquickcompiler.bbclass @@ -49,5 +49,5 @@ python __anonymous() { d.appendVar('RDEPENDS_' + pn, " %s-dev" % provider) else: d.appendVar('DEPENDS', " %s %s-native" % (provider, provider)) - d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler CONFIG+=no_qtquickcompiler_depend") + d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler") } diff --git a/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb b/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb index 98c3deb..b21b2ce 100644 --- a/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb +++ b/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb @@ -56,6 +56,9 @@ do_install() { install -d ${D}${OE_QMAKE_PATH_BINS} install -m 0755 ${THISDIR}/qtquickcompiler-sdk/bin/${NATIVESDK_BINARY} ${D}${OE_QMAKE_PATH_BINS} fi + + # Use the EffectivePath instead of installation path + sed -i -e 's|QT_HOST_BINS|QT_HOST_BINS/get|' ${D}${OE_QMAKE_PATH_ARCHDATA}/mkspecs/features/qtquickcompiler.prf } do_install_append_mingw32() { diff --git a/recipes-qt/qt5/qtquickcompiler_git.bb b/recipes-qt/qt5/qtquickcompiler_git.bb index e684364..ae3e87f 100644 --- a/recipes-qt/qt5/qtquickcompiler_git.bb +++ b/recipes-qt/qt5/qtquickcompiler_git.bb @@ -43,4 +43,9 @@ S = "${WORKDIR}/git" DEPENDS = "qtbase qtdeclarative" +do_install_append() { + # Use the EffectivePath instead of installation path + sed -i -e 's|QT_HOST_BINS|QT_HOST_BINS/get|' ${D}${OE_QMAKE_PATH_ARCHDATA}/mkspecs/features/qtquickcompiler.prf +} + BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf