Merge remote-tracking branch 'qtyocto/upstream/master' into 5.10

* qtyocto/upstream/master:

  qtbase_git: install qt.conf for the target
  qtbase: mkspecs: add default toolchain options
  qt5: remove use of OE_QMAKE_WAYLAND_SCANNER
  gstreamer1.0-plugins-bad: add expansion parameter
  qtlocation: correct PACKAGECONFIG for mapboxgl
  qt5: use correct HostPrefix
  qwt-qt5: rewrite completely
  Fix missing OE_QMAKE_STRIP env variable
  Upgrade to Qt 5.10.0
  qtwebengine: make test suite succeed

Conflicts:

  recipes-qt/qt5/nativesdk-qtbase_git.bb
  recipes-qt/qt5/qt3d_git.bb
  recipes-qt/qt5/qt5-git.inc
  recipes-qt/qt5/qtbase-native_git.bb
  ecipes-qt/qt5/qtbase_git.bb
  recipes-qt/qt5/qtcanvas3d_git.bb
  recipes-qt/qt5/qtcharts_git.bb
  recipes-qt/qt5/qtconnectivity_git.bb
  recipes-qt/qt5/qtdatavis3d_git.bb
  recipes-qt/qt5/qtdeclarative_git.bb
  recipes-qt/qt5/qtgamepad_git.bb
  recipes-qt/qt5/qtgraphicaleffects_git.bb
  recipes-qt/qt5/qtimageformats_git.bb
  recipes-qt/qt5/qtlocation_git.bb
  recipes-qt/qt5/qtmultimedia_git.bb
  recipes-qt/qt5/qtnetworkauth_git.bb
  recipes-qt/qt5/qtquickcontrols2_git.bb
  recipes-qt/qt5/qtquickcontrols_git.bb
  recipes-qt/qt5/qtremoteobjects_git.bb
  recipes-qt/qt5/qtscript_git.bb
  recipes-qt/qt5/qtscxml_git.bb
  recipes-qt/qt5/qtsensors_git.bb
  recipes-qt/qt5/qtserialbus_git.bb
  recipes-qt/qt5/qtserialport_git.bb
  recipes-qt/qt5/qtsvg_git.bb
  recipes-qt/qt5/qttools_git.bb
  recipes-qt/qt5/qttranslations_git.bb
  recipes-qt/qt5/qtvirtualkeyboard_git.bb
  recipes-qt/qt5/qtwayland_git.bb
  recipes-qt/qt5/qtwebchannel_git.bb
  recipes-qt/qt5/qtwebengine_git.bb
  recipes-qt/qt5/qtwebsockets_git.bb
  recipes-qt/qt5/qtwebview_git.bb
  recipes-qt/qt5/qtx11extras_git.bb
  recipes-qt/qt5/qtxmlpatterns_git.bb

Task-number: QTBUG-65164
Change-Id: I3a54ce7f3f82dcce2d9d1a13585a41178bda358c

1 files changed, 25 insertions, 0 deletions

diff --git a/recipes-qt/qt5/qtserialbus/0001-Add-missing-include-for-struct-timeval.patch b/recipes-qt/qt5/qtserialbus/0001-Add-missing-include-for-struct-timeval.patch
new file mode 100644
index 00000000..070c8e57
--- /dev/null
+++ b/recipes-qt/qt5/qtserialbus/0001-Add-missing-include-for-struct-timeval.patch
@@ -0,0 +1,25 @@
+From 896e90350f94654901e88f3365dd54986a6ba1fd Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Mon, 11 Dec 2017 14:39:34 +0200
+Subject: [PATCH] Add missing include for struct timeval
+
+Fix build failure with musl libc:
+socketcanbackend.h:88:38: error: 'timeval' was not declared in this scope
+
+Change-Id: I4089f5a906095c21b2790d35ad131d9a0713ff3b
+---
+ src/plugins/canbus/socketcan/socketcanbackend.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/plugins/canbus/socketcan/socketcanbackend.h b/src/plugins/canbus/socketcan/socketcanbackend.h
+index 50976b1..b49d267 100644
+--- a/src/plugins/canbus/socketcan/socketcanbackend.h
++++ b/src/plugins/canbus/socketcan/socketcanbackend.h
+@@ -50,6 +50,7 @@
+ #include <sys/socket.h>
+ #include <sys/uio.h>
+ #include <linux/can.h>
++#include <sys/time.h>
+ 
+ QT_BEGIN_NAMESPACE
+