Merge remote-tracking branch 'qtyocto/5.9' into 5.10

* qtyocto/5.9:

  qt5: update version to 5.9.3
  qt5: remove use of OE_QMAKE_WAYLAND_SCANNER
  qtquickcontrols: remove duplicate FILES append
  qtdeclarative: remove upstreamed patch
  qt5: update qtx11extras revision for 5.9.2
  qt5: update submodules
  qt5: update submodules
  Merge remote-tracking branch 'qtyocto/upstream/master' into 5.9
  qt5: add missing commercial license
  Fix compiling for qtenginio and qtquick1
  Use correct HostPrefix
  qt5: update submodules
  qtwebview: remove obsolete patch
  qt5: update submodules
  qtwebengine: add patch for long paths
  qtwebengine: update 0004-Force-host-toolchain-configuration.patch
  qtwebengine: fix build with glibc-2.26
  qt: upgrade to latest revision in 5.9 branch
  qt: refresh remaining patches and add links to meta-qt5 repos
  qtwebengine: add a fix for building demobrowser without printing support
  Upgrade to Qt 5.9.0
  qtbase, qtgraphicaleffect, qtmultimedia, qtscript, qtlocation, qtwayland: disable gold to work around binutils bug
  qtwebengine: disable SECURITY_STRINGFORMAT to fix the build
  meta-toolchain-qt5: don't rely on COREBASE/LICENSE
  qtbase: fix Krogoth build regression from efa8aaf
  qt3d: refresh patches
  qtwebengine: refresh patches
  qtbase: refresh the patches
  qtwebengine: update to 5.9.2
  qt5: bump version number to 5.9.2
  qtbase: fix Krogoth build regression from efa8aaf
  gstreamer1.0-plugins-bad: add qt5 packageconfig
  qtbase: remove qtbase-native from DEPENDS
  qt3d: Fix build with clang
  qtwebkit: Backport a patch to fix build with icu-59
  quazip: update to 0.7.3 and add missing metadata
  qtbase: Use sched_yield instead of pthread_yield
  qtbase: Fix ptests with clang
  qt5-ptest: fix build with yocto < 2.3 (pyro)
  qtbase: add ptest
  qwt-qt5.inc: fix QA warning
  qt5-git.inc: set CVE_PRODUCT to qt
  python-pyqt5: include QtWidgets module
  qt5-creator: Link with libexecinfo on musl
  qtvirtualkeyboard: Include sys/time.h
  qtwebengine: Fix build on musl
  qt5-creator: Fix build with NO_ACCESSIBILITY
  maliit-framework-qt5: Always have optimize flags
  qtbase-native: Fix qdbuscpp2xml segfault
  qt5-ptest.inc: append do_populate_sysroot only for target
  qtwebengine: fix build with gcc7
  qwt-qt5: Fix rpath issues
  qtquickcontrols2: fix compilation of examples/texteditor
  qtquick1: add ptest
  qtdeclarative: add ptest
  qtxmlpatterns: add ptest
  qt5: add qt5-ptest.inc
  qtwebengine: add PACKAGECONFIG for webrtc
  libconnman-qt5: update to 1.1.10
  Revert "qttools: DEPENDS on icu"
  qttools: DEPENDS on icu
  qtbase: respect "ld-is-gold" DISTRO_FEATURES

Change-Id: I9dfcab3c94b62b22b68e66e8b13bdf4c570aada1

1 files changed, 1 insertions, 3 deletions

diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index a556f4f9..538c9489 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -26,7 +26,6 @@ EXTRA_OEMAKE = " \
     OE_QMAKE_LDFLAGS='${OE_QMAKE_LDFLAGS}' \
     OE_QMAKE_AR='${OE_QMAKE_AR}' \
     OE_QMAKE_STRIP='${OE_QMAKE_STRIP}' \
-    OE_QMAKE_WAYLAND_SCANNER='${OE_QMAKE_WAYLAND_SCANNER}' \
     OE_QMAKE_INCDIR_QT='${STAGING_DIR_TARGET}/${OE_QMAKE_PATH_HEADERS}' \
 "
 
@@ -40,7 +39,6 @@ export OE_QMAKE_LINK = "${CXX}"
 export OE_QMAKE_LDFLAGS = "${LDFLAGS}"
 export OE_QMAKE_AR = "${AR}"
 export OE_QMAKE_STRIP = "echo"
-export OE_QMAKE_WAYLAND_SCANNER = "${STAGING_BINDIR_NATIVE}/wayland-scanner"
 
 # qmake reads if from shell environment
 export OE_QMAKE_QTCONF_PATH = "${WORKDIR}/qt.conf"
@@ -85,7 +83,7 @@ generate_qt_config_file_effective_paths() {
 [EffectivePaths]
 HostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}
 HostData = ${OE_QMAKE_PATH_HOST_DATA}
-HostPrefix = ${STAGING_DIR_NATIVE}${prefix_native}
+HostPrefix = ${STAGING_DIR_NATIVE}
 EOF
 }
 #