qt5: update submodules

Remove unneeded patch qtbase and rework qtwayland recipe to build
qtwaylandscanner without need for patch.

Change-Id: I41d5c020cbe853a52896b85824990c66cc97d6bb
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

15 files changed, 19 insertions, 136 deletions

diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index f7504f25..526a9c17 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -27,7 +27,6 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:"
 # common for qtbase-native, qtbase-nativesdk and qtbase
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
-    file://0002-configure-force-cross_compile.patch \
     file://0003-Add-external-hostbindir-option.patch \
     file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
     file://0005-configure-bump-path-length-from-256-to-512-character.patch \
@@ -189,4 +188,4 @@ fakeroot do_generate_qt_environment_file() {
 
 addtask generate_qt_environment_file after do_install before do_package
 
-SRCREV = "016b5bc949b6dfb2f76db2e8b40a40e7eaee6828"
+SRCREV = "969bb10eed646313209fcdd9b84605aa98fc88de"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 7f41c8df..b8dc6f3b 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -105,4 +105,4 @@ do_install() {
     ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
 }
 
-SRCREV = "016b5bc949b6dfb2f76db2e8b40a40e7eaee6828"
+SRCREV = "969bb10eed646313209fcdd9b84605aa98fc88de"
diff --git a/recipes-qt/qt5/qtbase/0002-configure-force-cross_compile.patch b/recipes-qt/qt5/qtbase/0002-configure-force-cross_compile.patch
deleted file mode 100644
index 3f011b09..00000000
--- a/recipes-qt/qt5/qtbase/0002-configure-force-cross_compile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3ed6db12a1de305eae7c61e6e11572d77a75d595 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@theqtcompany.com>
-Date: Fri, 11 Mar 2016 16:00:23 +0200
-Subject: [PATCH] configure: force cross_compile
-
-Configure enabled cross_compile only if mkspec and xmkspec are difference,
-in yocto build that is never true, so force cross_compile feature.
-
-Use qttools (moc etc.) from correct path defined by qt.conf
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Change-Id: I6bfed072c9826094dcda9c7112b0c8b9d4055366
----
- configure.pri | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/configure.pri b/configure.pri
-index 6a75398..940e307 100644
---- a/configure.pri
-+++ b/configure.pri
-@@ -57,9 +57,7 @@ defineTest(qtConfCommandline_sanitize) {
- # callbacks
- 
- defineReplace(qtConfFunc_crossCompile) {
--    spec = $$[QMAKE_SPEC]
--    !equals(spec, $$[QMAKE_XSPEC]): return(true)
--    return(false)
-+    return(true)
- }
- 
- # custom tests
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index db2dbe7a..242aaf01 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -17,7 +17,6 @@ LIC_FILES_CHKSUM = " \
 # common for qtbase-native, qtbase-nativesdk and qtbase
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
-    file://0002-configure-force-cross_compile.patch \
     file://0003-Add-external-hostbindir-option.patch \
     file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
     file://0005-configure-bump-path-length-from-256-to-512-character.patch \
@@ -183,4 +182,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
 
 RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
 
-SRCREV = "016b5bc949b6dfb2f76db2e8b40a40e7eaee6828"
+SRCREV = "969bb10eed646313209fcdd9b84605aa98fc88de"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 963b8920..a1477b1a 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia"
 
-SRCREV = "6e224c11080feef2c6d7857d061a92e320e50899"
+SRCREV = "15447eed96be05b2607fa23c6455c37ab1990282"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index f4e49235..c1d6b77f 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -42,6 +42,6 @@ do_install_append_class-nativesdk() {
 
 EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
 
-SRCREV = "210a4584b87add2061f805ae50eb5079eec48cf5"
+SRCREV = "9d085bf0024c442b14b7d22bc629574058176deb"
 
 BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 7e77cd0d..49579dd6 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -29,4 +29,4 @@ do_configure_prepend() {
 EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'geoclue', 'CONFIG+=OE_GEOCLUE_ENABLED', '', d)}"
 EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'gypsy', 'CONFIG+=OE_GYPSY_ENABLED', '', d)}"
 
-SRCREV = "186e4421cf968d1b4927e90340f356c0dac770dd"
+SRCREV = "8aabdb0975c3532324d299dfa62aa333a56d2d3b"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 3b3bfea0..b93cd6c7 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtdeclarative"
 
-SRCREV = "124dd9adb5882048e44dcd012e08899d4e480196"
+SRCREV = "e09a8591990e5281929ca2a7bb180bb3a35556ba"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index 84881bc4..2058e229 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -25,4 +25,4 @@ ARM_INSTRUCTION_SET_armv5 = "arm"
 
 DEPENDS += "qtbase"
 
-SRCREV = "f774bac109684c4391cfae3e919eafb34666bf51"
+SRCREV = "89e980b8e0007a3615d01286d1f590fb95757233"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 36bded7f..3d77ec70 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -30,6 +30,6 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
 
 EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)}"
 
-SRCREV = "7c87ba01191e172bc10fb31f173520cb169a9a03"
+SRCREV = "b8113e90e2a1d9ea38a478990a93615f432ac35b"
 
 BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index edcc3c42..c93a9bd5 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -48,4 +48,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
 
 DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns"
 
-SRCREV = "a2174fa1270ff366f03e7d22aa49101c958ca4fc"
+SRCREV = "947a55149aec2724158934efde1be496b3c5e04e"
diff --git a/recipes-qt/qt5/qtwayland/0001-Allow-building-only-qtwaylandscanner.patch b/recipes-qt/qt5/qtwayland/0001-Allow-building-only-qtwaylandscanner.patch
deleted file mode 100644
index 7b776733..00000000
--- a/recipes-qt/qt5/qtwayland/0001-Allow-building-only-qtwaylandscanner.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From a028632be1f579c873a3585081d9aae4f9c8d738 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Fri, 9 Sep 2016 10:24:54 +0300
-Subject: [PATCH] Allow building only qtwaylandscanner
-
-Change-Id: I81af38e73b4b54aef2a53b9a3e491aaa7c412706
-Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
----
- qtwayland.pro | 10 +++++-----
- src/src.pro   |  8 ++++----
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/qtwayland.pro b/qtwayland.pro
-index f71b842..1be518a 100644
---- a/qtwayland.pro
-+++ b/qtwayland.pro
-@@ -14,25 +14,25 @@ qtCompileTest(libhybris_egl_server)
- 
- load(qt_parts)
- 
--!config_wayland {
-+!scanner-only:!config_wayland {
-     warning("QtWayland requires Wayland 1.6.0 or higher, QtWayland will not be built")
-     SUBDIRS =
- }
- 
--!config_xkbcommon {
-+!scanner-only:!config_xkbcommon {
-     warning("No xkbcommon 0.2.0 or higher found, disabling support for it")
- }
- 
--!config_wayland_scanner {
-+!scanner-only:!config_wayland_scanner {
-     warning("QtWayland requires wayland-scanner, QtWayland will not be built")
-     SUBDIRS =
- }
- 
--!config_wayland_cursor {
-+!scanner-only:!config_wayland_cursor {
-     warning("QtWayland requires wayland-cursor, QtWayland will not be built")
-     SUBDIRS =
- }
- 
--!config_wayland_egl {
-+!scanner-only:!config_wayland_egl {
-     message("no wayland-egl support detected, cross-toolkit compatibility disabled");
- }
-diff --git a/src/src.pro b/src/src.pro
-index bf5ffe3..92c82f6 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -7,19 +7,19 @@ SUBDIRS += sub_qtwaylandscanner
- sub_compositor.subdir = compositor
- sub_compositor.depends = sub-qtwaylandscanner
- sub_compositor.target = sub-compositor
--SUBDIRS += sub_compositor
-+!scanner-only:SUBDIRS += sub_compositor
- 
- sub_imports.subdir = imports
- sub_imports.depends += sub-compositor
- sub_imports.target = sub-imports
--SUBDIRS += sub_imports
-+!scanner-only:SUBDIRS += sub_imports
- 
- sub_client.subdir = client
- sub_client.depends = sub-qtwaylandscanner
- sub_client.target = sub-client
--SUBDIRS += sub_client
-+!scanner-only:SUBDIRS += sub_client
- 
- sub_plugins.subdir = plugins
- sub_plugins.depends = sub-qtwaylandscanner sub-client sub-compositor
- sub_plugins.target = sub-plugins
--SUBDIRS += sub_plugins
-+!scanner-only:SUBDIRS += sub_plugins
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 431dc12c..c2931257 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -15,9 +15,6 @@ LIC_FILES_CHKSUM = " \
     file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
-
-SRC_URI += "file://0001-Allow-building-only-qtwaylandscanner.patch"
-
 #FIXME: xkb should be optional; we add it here to fix the build error without it
 #       (https://bugreports.qt.io/browse/QTBUG-54851)
 PACKAGECONFIG ?= " \
@@ -26,8 +23,12 @@ PACKAGECONFIG ?= " \
     xkb \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcompositor xkb glx', '', d)} \
 "
-PACKAGECONFIG_class-native ?= "scanner-only"
-PACKAGECONFIG_class-nativesdk ?= "scanner-only"
+PACKAGECONFIG_class-native ?= ""
+PACKAGECONFIG_class-nativesdk ?= ""
+QMAKE_PROFILES_class-native = "${S}/src/qtwaylandscanner"
+QMAKE_PROFILES_class-nativesdk = "${S}/src/qtwaylandscanner"
+B_class-native = "${SEPB}/src/qtwaylandscanner"
+B_class-nativesdk = "${SEPB}/src/qtwaylandscanner"
 
 PACKAGECONFIG[compositor-api] = "CONFIG+=wayland-compositor"
 PACKAGECONFIG[xcompositor] = "CONFIG+=config_xcomposite CONFIG+=done_config_xcomposite,CONFIG+=done_config_xcomposite,libxcomposite"
@@ -37,18 +38,9 @@ PACKAGECONFIG[wayland-egl] = "CONFIG+=config_wayland_egl CONFIG+=done_config_way
 PACKAGECONFIG[brcm-egl] = "CONFIG+=config_brcm_egl CONFIG+=done_config_brcm_egl,CONFIG+=done_config_brcm_egl,virtual/egl"
 PACKAGECONFIG[drm-egl] = "CONFIG+=config_drm_egl_server CONFIG+=done_config_drm_egl_server,CONFIG+=done_config_drm_egl_server,libdrm virtual/egl"
 PACKAGECONFIG[libhybris-egl] = "CONFIG+=config_libhybris_egl_server CONFIG+=done_config_libhybris_egl_server,CONFIG+=done_config_libhybris_egl_server,libhybris"
-PACKAGECONFIG[scanner-only] = "CONFIG+=scanner-only"
 
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
 
-FILES_${PN}-plugins += " \
-    ${OE_QMAKE_PATH_PLUGINS}/*/*/*${SOLIBSDEV} \
-"
-
-FILES_${PN}-plugins-dbg += " \
-    ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug/* \
-"
-
-SRCREV = "582c6a379f6a45648352c538a7df4d675c9d0a65"
+SRCREV = "3443483c9efdcfbfe049f96c83f83a5bf1d81e61"
 
 BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 5bf6056c..24f94d56 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -122,7 +122,7 @@ SRC_URI += " \
     file://0002-chromium-Change-false-to-FALSE-and-1-to-TRUE-FIX-qtw.patch \
 "
 
-SRCREV_qtwebengine = "4894406d111d7c7c0fb06b56e52706a20b35d0b3"
+SRCREV_qtwebengine = "ac3d8780a0293793dbc3cd47b96aab4613dec5d9"
 SRCREV_chromium = "f3ce802c71aeaeb7dd218180a3bc5c6ac63b445d"
 SRCREV = "${SRCREV_qtwebengine}"
 
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index a6e88ced..73f5dbfd 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -16,6 +16,6 @@ LIC_FILES_CHKSUM = " \
 
 DEPENDS += "qtbase"
 
-SRCREV = "973105d9fb3372910255825e7395fb1156e24c02"
+SRCREV = "977d0fb3f0bf776e2aad3c8ff795115ce62909ff"
 
 BBCLASSEXTEND =+ "native nativesdk"