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, 6 insertions, 2 deletions

diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 0755c60e..93b37f18 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -1,7 +1,7 @@
 require qt5.inc
 require qt5-git.inc
 
-LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
+LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & The-Qt-Company-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0 | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
     file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
@@ -21,9 +21,13 @@ PACKAGECONFIG[geoservices_mapboxgl] = "-feature-geoservices_mapboxgl,-no-feature
 
 EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
 
+# The same issue as in qtbase:
+# http://errors.yoctoproject.org/Errors/Details/152640/
+LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
+
 SRC_URI += " \
     ${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=upstream/qt-staging;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
-    "
+"
 
 SRCREV_qtlocation = "2b230b0a10d898979e9d5193f4da2e408b397fe3"
 SRCREV_qtlocation-mapboxgl = "1c633072fcea7ad153ab6f8ec40dd72d83541ead"