diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-09-04 15:48:41 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-09-04 15:49:48 +0300 |
| commit | 7ff5cd75fe5f242665b6447fc7fdf5e0988eebca (patch) | |
| tree | dbdc62a1263761e1fb5792761f09490f8b000140 /classes | |
| parent | e630a1db10a1539f2a4152cad5b0fb1231bc94d3 (diff) | |
| parent | 0a606b46deaa7938308eebf068dc204c33984332 (diff) | |
| download | meta-boot2qt-7ff5cd75fe5f242665b6447fc7fdf5e0988eebca.tar.gz | |
Merge remote-tracking branch 'origin/morty' into pyro
* origin/morty:
meta-qt5: update layer
sdk: don't add qtwayland-scanner to mingw toolchain
sdk: add qtwayland tools to the toolchain
qtdeviceutilities: update module
b2qt-appcontroller: update SRCREV
Fix DNS for Qemu running on b2qt toolchain sysroot
qt5: update meta-qt5 layer
Change-Id: I0f21133d60417297225da9b9f27b49fd1b9dc400
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/populate_b2qt_qt5_sdk.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/classes/populate_b2qt_qt5_sdk.bbclass b/classes/populate_b2qt_qt5_sdk.bbclass index 7acd095..fd7b43c 100644 --- a/classes/populate_b2qt_qt5_sdk.bbclass +++ b/classes/populate_b2qt_qt5_sdk.bbclass | |||
| @@ -67,6 +67,9 @@ EOF | |||
| 67 | echo 'TargetSpec = devices/linux-oe-generic-g++' >> $qtconf | 67 | echo 'TargetSpec = devices/linux-oe-generic-g++' >> $qtconf |
| 68 | 68 | ||
| 69 | create_qtcreator_configure_script | 69 | create_qtcreator_configure_script |
| 70 | |||
| 71 | # Link /etc/resolv.conf is broken in the toolchain sysroot, remove it | ||
| 72 | rm -f ${SDK_OUTPUT}${SDKTARGETSYSROOT}${sysconfdir}/resolv.conf | ||
| 70 | } | 73 | } |
| 71 | 74 | ||
| 72 | create_qtcreator_configure_script () { | 75 | create_qtcreator_configure_script () { |