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 /classes/qtquickcompiler.bbclass | |
| 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 'classes/qtquickcompiler.bbclass')
| -rw-r--r-- | classes/qtquickcompiler.bbclass | 2 |
1 files changed, 1 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 | } |