diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-10-06 13:41:45 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-10-06 13:42:38 +0300 |
| commit | 41b0b462c88f3aa5831a14c928c58dcb0233668f (patch) | |
| tree | 7475e065a9e73e4c0eb47ed73da43d5fd841f86d /recipes-qt/qt5-addons | |
| parent | f33e451c112d3121db61785d5943b5a2c0a22479 (diff) | |
| parent | e6e7c85a095c32ea7766fc61f4a7138c1328ec4c (diff) | |
| download | meta-boot2qt-41b0b462c88f3aa5831a14c928c58dcb0233668f.tar.gz | |
Merge remote-tracking branch 'origin/morty' into pyro
* origin/morty:
qdb: remove bashishm from the init script
qt5: update qtx11extras submodule & quickcompiler revision
meta-qt5: update to 5.9.2 RC
Add generic qemuarmv7 machine config
meta-qt5: update meta layer
quickcompiler: update revision
meta-qt5: update layer
poky, meta-oe: update morty branch layers
qtquickcompiler: fix path for QT_HOST_BINS
sdk: fix host_build QT_ARCH
qtdeviceutilities: update component
qtwebview: include qtwebview into image and toolchain
Conflicts:
recipes-qt/qt5-addons/qtglesstream.bb
recipes-qt/qt5/qtdeviceutilities.bb
recipes-qt/qt5/qtquickcompiler_git.bb
scripts/manifest.xml
Change-Id: I42667bfd90b1136604213805a0d70c3936a96776
Diffstat (limited to 'recipes-qt/qt5-addons')
| -rw-r--r-- | recipes-qt/qt5-addons/qtquickcompiler-sdk.bb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb b/recipes-qt/qt5-addons/qtquickcompiler-sdk.bb index 7f3e85b..3743623 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() { |