diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-09-26 13:15:00 +0300 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2017-09-26 13:21:41 +0000 |
commit | 545bebca0722c21c4cd61c47260202bda20f2db4 (patch) | |
tree | 82503d6da46d47cb63dbb69f70739c710588f750 | |
parent | 81831558b4dfdeb5030d6519f29d9ce122a434ce (diff) | |
download | meta-boot2qt-545bebca0722c21c4cd61c47260202bda20f2db4.tar.gz |
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 <mikko.gronoff@qt.io>
-rw-r--r-- | classes/qtquickcompiler.bbclass | 2 | ||||
-rw-r--r-- | recipes-qt/qt5-addons/qtquickcompiler-sdk.bb | 3 | ||||
-rw-r--r-- | recipes-qt/qt5/qtquickcompiler_git.bb | 5 |
3 files changed, 9 insertions, 1 deletions
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() { | |||
49 | d.appendVar('RDEPENDS_' + pn, " %s-dev" % provider) | 49 | d.appendVar('RDEPENDS_' + pn, " %s-dev" % provider) |
50 | else: | 50 | else: |
51 | d.appendVar('DEPENDS', " %s %s-native" % (provider, provider)) | 51 | d.appendVar('DEPENDS', " %s %s-native" % (provider, provider)) |
52 | d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler CONFIG+=no_qtquickcompiler_depend") | 52 | d.appendVar('EXTRA_QMAKEVARS_PRE', " CONFIG+=qtquickcompiler") |
53 | } | 53 | } |
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() { | |||
56 | install -d ${D}${OE_QMAKE_PATH_BINS} | 56 | install -d ${D}${OE_QMAKE_PATH_BINS} |
57 | install -m 0755 ${THISDIR}/qtquickcompiler-sdk/bin/${NATIVESDK_BINARY} ${D}${OE_QMAKE_PATH_BINS} | 57 | install -m 0755 ${THISDIR}/qtquickcompiler-sdk/bin/${NATIVESDK_BINARY} ${D}${OE_QMAKE_PATH_BINS} |
58 | fi | 58 | fi |
59 | |||
60 | # Use the EffectivePath instead of installation path | ||
61 | sed -i -e 's|QT_HOST_BINS|QT_HOST_BINS/get|' ${D}${OE_QMAKE_PATH_ARCHDATA}/mkspecs/features/qtquickcompiler.prf | ||
59 | } | 62 | } |
60 | 63 | ||
61 | do_install_append_mingw32() { | 64 | 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" | |||
43 | 43 | ||
44 | DEPENDS = "qtbase qtdeclarative" | 44 | DEPENDS = "qtbase qtdeclarative" |
45 | 45 | ||
46 | do_install_append() { | ||
47 | # Use the EffectivePath instead of installation path | ||
48 | sed -i -e 's|QT_HOST_BINS|QT_HOST_BINS/get|' ${D}${OE_QMAKE_PATH_ARCHDATA}/mkspecs/features/qtquickcompiler.prf | ||
49 | } | ||
50 | |||
46 | BBCLASSEXTEND = "native nativesdk" | 51 | BBCLASSEXTEND = "native nativesdk" |