aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-06-04 10:34:12 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2019-06-05 07:05:50 +0000
commit3afea0f29ece40966b431786c2100a62819e22f6 (patch)
treee6746ecbdc4026abd2ea07a16fe90fbabd92dc0c /recipes-qt
parent0106f58f31df6b426dca2bb810fed5009d4cb28f (diff)
qt5: update submodules
Latest revisions from dev branch. Patches needed from 5.13.0 branches that are not yet merged in dev. Change-Id: Ia9a215b2136f8c491af971b32d8464fe3e92def0 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'recipes-qt')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qt3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb2
-rw-r--r--recipes-qt/qt5/qtbase_git.bb2
-rw-r--r--recipes-qt/qt5/qtcharts_git.bb2
-rw-r--r--recipes-qt/qt5/qtconnectivity_git.bb2
-rw-r--r--recipes-qt/qt5/qtdatavis3d_git.bb2
-rw-r--r--recipes-qt/qt5/qtdeclarative_git.bb2
-rw-r--r--recipes-qt/qt5/qtgamepad_git.bb2
-rw-r--r--recipes-qt/qt5/qtgraphicaleffects_git.bb2
-rw-r--r--recipes-qt/qt5/qtimageformats_git.bb2
-rw-r--r--recipes-qt/qt5/qtlocation_git.bb2
-rw-r--r--recipes-qt/qt5/qtlottie_git.bb2
-rw-r--r--recipes-qt/qt5/qtmultimedia_git.bb2
-rw-r--r--recipes-qt/qt5/qtnetworkauth_git.bb2
-rw-r--r--recipes-qt/qt5/qtpurchasing_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols2_git.bb2
-rw-r--r--recipes-qt/qt5/qtquickcontrols_git.bb2
-rw-r--r--recipes-qt/qt5/qtremoteobjects_git.bb2
-rw-r--r--recipes-qt/qt5/qtscript_git.bb2
-rw-r--r--recipes-qt/qt5/qtscxml_git.bb2
-rw-r--r--recipes-qt/qt5/qtsensors_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialbus_git.bb2
-rw-r--r--recipes-qt/qt5/qtserialport_git.bb2
-rw-r--r--recipes-qt/qt5/qtsvg_git.bb2
-rw-r--r--recipes-qt/qt5/qttools_git.bb2
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard/0001-Use-correct-path-to-lib-dir.patch28
-rw-r--r--recipes-qt/qt5/qtvirtualkeyboard_git.bb4
-rw-r--r--recipes-qt/qt5/qtwayland_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebchannel_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebengine/0004-Fix-linker-too-long-argument-list.patch46
-rw-r--r--recipes-qt/qt5/qtwebengine/0005-Make-linker-call-look-great-again.patch115
-rw-r--r--recipes-qt/qt5/qtwebengine_git.bb6
-rw-r--r--recipes-qt/qt5/qtwebsockets_git.bb2
-rw-r--r--recipes-qt/qt5/qtwebview_git.bb2
-rw-r--r--recipes-qt/qt5/qtx11extras_git.bb2
-rw-r--r--recipes-qt/qt5/qtxmlpatterns_git.bb2
37 files changed, 228 insertions, 35 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 38c8cc03..be8707eb 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -193,4 +193,4 @@ fakeroot do_generate_qt_environment_file() {
do_generate_qt_environment_file[umask] = "022"
addtask generate_qt_environment_file after do_install before do_package
-SRCREV = "8f44aeb10317664dd7cae92e628fb0814e432e17"
+SRCREV = "a0c4b6f34546bdd22167a76a0540d37e9a37c0cf"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 067267df..0d0f11ec 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -36,6 +36,6 @@ do_configure_prepend() {
${S}/src/quick3d/imports/input/importsinput.pro
}
-SRCREV = "100175e92d6adb346169eda0392b9485ca41a905"
+SRCREV = "f39178a415cb41470775a86e0aa358faa3686d81"
BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index c4137f5e..b31c5cab 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -141,4 +141,4 @@ do_install() {
echo 'set(_qt5_corelib_extra_includes "${_qt5Core_install_prefix}/lib${QT_DIR_NAME}/mkspecs/linux-oe-g++")' > ${D}${libdir}/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
}
-SRCREV = "8f44aeb10317664dd7cae92e628fb0814e432e17"
+SRCREV = "a0c4b6f34546bdd22167a76a0540d37e9a37c0cf"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 293b9281..b925d573 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -275,4 +275,4 @@ INSANE_SKIP_${PN}-mkspecs += "file-rdeps"
RRECOMMENDS_${PN}-plugins += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', '', d)}"
-SRCREV = "8f44aeb10317664dd7cae92e628fb0814e432e17"
+SRCREV = "a0c4b6f34546bdd22167a76a0540d37e9a37c0cf"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 336f51db..07ac282f 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtmultimedia"
-SRCREV = "4618124ada61c28eefc3ab89fd151c0f9fbbba71"
+SRCREV = "5bc7cc7c5c9f4bdc72ae23c16c3c78d6bff86365"
# The same issue as in qtbase:
# http://errors.yoctoproject.org/Errors/Details/152641/
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index afdce9d5..1a4d03fc 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -21,4 +21,4 @@ PACKAGECONFIG[bluez] = "-feature-bluez,-no-feature-bluez,${BLUEZ}"
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
-SRCREV = "21bfb7620f3cdcaf3d2b7c0b8a2294e174c7053b"
+SRCREV = "6b9469b1a229486986f572af09459dacce5795de"
diff --git a/recipes-qt/qt5/qtdatavis3d_git.bb b/recipes-qt/qt5/qtdatavis3d_git.bb
index ffe88707..ed6ae7ff 100644
--- a/recipes-qt/qt5/qtdatavis3d_git.bb
+++ b/recipes-qt/qt5/qtdatavis3d_git.bb
@@ -8,4 +8,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative qtmultimedia qtxmlpatterns"
-SRCREV = "afe8f78d360eab894e6e85ecd72c75d8f365e6bb"
+SRCREV = "d78542919276ee6a87bfd75b83276dd72b791aaa"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index 04d86f46..19499e38 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -24,6 +24,6 @@ do_install_append_class-nativesdk() {
rm -rf ${D}${OE_QMAKE_PATH_QML}
}
-SRCREV = "2ccd4c3672e5db2c25ca0f8df439fe8f646aa942"
+SRCREV = "9d61684d70c8691d81536b7b519388586e2cbbb8"
BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtgamepad_git.bb b/recipes-qt/qt5/qtgamepad_git.bb
index 33ff924e..9a5f623f 100644
--- a/recipes-qt/qt5/qtgamepad_git.bb
+++ b/recipes-qt/qt5/qtgamepad_git.bb
@@ -14,4 +14,4 @@ PACKAGECONFIG[sdl2] = "-feature-sdl2,-no-feature-sdl2,libsdl2"
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
-SRCREV = "3cf4be211ad58425d89c238b23bec5cedd79c111"
+SRCREV = "337abe99492d7d6d5229b615fa1559fc2f4ee6eb"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 747c34b2..52d66c34 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -18,4 +18,4 @@ RDEPENDS_${PN}-dev = ""
# http://errors.yoctoproject.org/Errors/Build/44912/
LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
-SRCREV = "c6fe3e3be58efa4002876ad2b5c811355d1b21f0"
+SRCREV = "fe2eefc036f3f42457e7f2e012f21fdec84550eb"
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index 36985903..dd7594d4 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -25,4 +25,4 @@ PACKAGECONFIG[libwebp] = ",CONFIG+=done_config_libwebp,libwebp"
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
-SRCREV = "155410fd6369ceafccb865a9d0fe2169c63a7368"
+SRCREV = "9a4a2dd5189e1659bce46eacef513b0c5680bb1e"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index d0b443ee..76a89e04 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -31,7 +31,7 @@ SRC_URI += " \
${QT_GIT}/qtlocation-mapboxgl.git;name=qtlocation-mapboxgl;branch=${QT_MODULE_BRANCH_MAPBOXGL};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/mapbox-gl-native \
"
-SRCREV_qtlocation = "5c53cd23351a1850f170dcf2fdcab7545cac3ddc"
+SRCREV_qtlocation = "971423c512623b84618cfc73b992da1f1dc014f8"
SRCREV_qtlocation-mapboxgl = "4b85252fbe811a786c6ee9eabedb7639b031dc53"
SRCREV_FORMAT = "qtlocation_qtlocation-mapboxgl"
diff --git a/recipes-qt/qt5/qtlottie_git.bb b/recipes-qt/qt5/qtlottie_git.bb
index 03834107..1acf17f3 100644
--- a/recipes-qt/qt5/qtlottie_git.bb
+++ b/recipes-qt/qt5/qtlottie_git.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
-SRCREV = "80151882a9a806f5fdbb700fd6a0db1300d9d5e0"
+SRCREV = "254ea99abd181abe5468b7cc5ece0e2ae51da185"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 025f3018..4a8b3053 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -37,4 +37,4 @@ SRC_URI += "\
# http://errors.yoctoproject.org/Errors/Build/44914/
LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
-SRCREV = "2755dcf670f8b40ec2f3ecce356b378db08da872"
+SRCREV = "afca8928ce8e4113a224e57fa30a3b4bc5a2db47"
diff --git a/recipes-qt/qt5/qtnetworkauth_git.bb b/recipes-qt/qt5/qtnetworkauth_git.bb
index d17b6c4a..8b20db43 100644
--- a/recipes-qt/qt5/qtnetworkauth_git.bb
+++ b/recipes-qt/qt5/qtnetworkauth_git.bb
@@ -9,4 +9,4 @@ require qt5-git.inc
DEPENDS += "qtbase"
-SRCREV = "2b1e9bfec5b6017f3e16dfc6c8df94523aefe286"
+SRCREV = "8bc6feb36a471006cfa4b62189edc3d7fd67bf78"
diff --git a/recipes-qt/qt5/qtpurchasing_git.bb b/recipes-qt/qt5/qtpurchasing_git.bb
index a41f11dc..7e0da5b1 100644
--- a/recipes-qt/qt5/qtpurchasing_git.bb
+++ b/recipes-qt/qt5/qtpurchasing_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
-SRCREV = "0992ba9d0c78ab99fe7387d1e53cad0e9db0ff45"
+SRCREV = "91fc2ee34cfd674d134e88dc7f3c54453ec685e7"
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 198c62fd..cc923157 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtdeclarative qtdeclarative-native"
-SRCREV = "d1fdbd128f6e95255c7d9fc20ef07f44677a649e"
+SRCREV = "2ee351b36b265ead80a6240c83fa9ab5d444bf08"
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 77e3f50a..f5594dbe 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -17,4 +17,4 @@ FILES_${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/QtQuick/Dialogs/qml/icons.ttf \
"
-SRCREV = "bdff4debf5f3f8125e3b7876bb5c62bc4251727f"
+SRCREV = "d2a661f16e9982c45260efb9875b83c581b82287"
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb
index 052ca227..b6130f79 100644
--- a/recipes-qt/qt5/qtremoteobjects_git.bb
+++ b/recipes-qt/qt5/qtremoteobjects_git.bb
@@ -24,6 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
-SRCREV = "6272bab4eb61f39cfe4ada059f528c8d00246732"
+SRCREV = "6f0873134652fb5cba3d340075fdf99989c462b4"
BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index db0c6fce..6473fa15 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -36,4 +36,4 @@ DEPENDS += "qtbase"
# http://errors.yoctoproject.org/Errors/Build/44915/
LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
-SRCREV = "fc99750865129c3abe9c827dd136ab717a7f4601"
+SRCREV = "583dcc6d31bb44d9d36c6a18dd71d54cbb6d5683"
diff --git a/recipes-qt/qt5/qtscxml_git.bb b/recipes-qt/qt5/qtscxml_git.bb
index 315eab5a..83f61246 100644
--- a/recipes-qt/qt5/qtscxml_git.bb
+++ b/recipes-qt/qt5/qtscxml_git.bb
@@ -10,7 +10,7 @@ require qt5-git.inc
DEPENDS += "qtbase qtdeclarative qtxmlpatterns qtscxml-native"
-SRCREV = "96b435525b17f1e16be953e01cd1f573e4342c2f"
+SRCREV = "fba55184b93e8f084b45716162581a6132fe94cc"
# Patches from https://github.com/meta-qt5/qtscxml/commits/b5.12
# 5.12.meta-qt5.2
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 6fc20a87..7bb25462 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
-SRCREV = "9b309ffa389f58f3a87bf132e123ae78aee808a3"
+SRCREV = "6a8e8a64d3473c5ff890c022b738862a704516dc"
diff --git a/recipes-qt/qt5/qtserialbus_git.bb b/recipes-qt/qt5/qtserialbus_git.bb
index 1da60667..ffe63c76 100644
--- a/recipes-qt/qt5/qtserialbus_git.bb
+++ b/recipes-qt/qt5/qtserialbus_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtserialport"
-SRCREV = "960861ac561f4bd4d8ce4fbe6d0643482d961f11"
+SRCREV = "fdf0ff9dfbc62cdaa86da3b4c47c99806161ec0e"
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 9fad00ed..2d06000d 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
-SRCREV = "f03f1476fb1d95dff3dab3ecf2db8ca6edb0e013"
+SRCREV = "450156f37356f67f217de760a5df3149684dd99f"
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index f161dcbc..994be44c 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
-SRCREV = "798f3010b1b6fe14b3bb56f136b7f126b8144398"
+SRCREV = "357a5bd4d6682a50d85c88ba485ed34c745fae85"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index d22433b3..b63c6b1d 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -32,7 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \
${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \
"
-SRCREV = "2ba9cc9aad6fbd950ac4aa090f6480a500679ea2"
+SRCREV = "a3190387ab37849cd5ded6fcf350afca8cd17246"
BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard/0001-Use-correct-path-to-lib-dir.patch b/recipes-qt/qt5/qtvirtualkeyboard/0001-Use-correct-path-to-lib-dir.patch
new file mode 100644
index 00000000..10b2fa8c
--- /dev/null
+++ b/recipes-qt/qt5/qtvirtualkeyboard/0001-Use-correct-path-to-lib-dir.patch
@@ -0,0 +1,28 @@
+From fcb62ce57d5e1a86bfdeced3391321a47250fcce Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Tue, 14 May 2019 09:12:42 +0300
+Subject: [PATCH] Use correct path to lib dir
+
+-L path was pointing to non-existing directory.
+
+Task-number: QTBUG-75802
+Change-Id: I9a72c57ef63d8da860c220041c2000ce3f1fefa8
+Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
+Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
+---
+ src/plugins/lipi-toolkit/plugin/plugin.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/lipi-toolkit/plugin/plugin.pro b/src/plugins/lipi-toolkit/plugin/plugin.pro
+index c3a1244..e342af1 100644
+--- a/src/plugins/lipi-toolkit/plugin/plugin.pro
++++ b/src/plugins/lipi-toolkit/plugin/plugin.pro
+@@ -26,7 +26,7 @@ include(../../../config.pri)
+ INCLUDEPATH += \
+ ../3rdparty/lipi-toolkit/src/include \
+ ../3rdparty/lipi-toolkit/src/util/lib
+-LIBS += -L$$OUT_PWD/../../lib \
++LIBS += -L$$OUT_PWD/../../../../lib \
+ -lshaperecommon$$qtPlatformTargetSuffix() \
+ -lltkcommon$$qtPlatformTargetSuffix() \
+ -lltkutil$$qtPlatformTargetSuffix()
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index 0be2982d..b6e08380 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
"
+SRC_URI += "file://0001-Use-correct-path-to-lib-dir.patch"
+
# To enabled Nuance T9 Write support, you need to provide the licensed components
# and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file.
# for example:
@@ -49,4 +51,4 @@ FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg qtxmlpatterns qtdeclarative-native"
-SRCREV = "039e3e85f9c3b4cd4980fa944e321f7009b93fd0"
+SRCREV = "460a7cee80e21df752501161c91b08c2059612fb"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index abd8eb01..34b108c8 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -37,7 +37,7 @@ PACKAGECONFIG[wayland-libhybris-egl-server-buffer] = "-feature-wayland-libhybris
EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
-SRCREV = "838de08ed24c947be9ea3c311afc1556e62be9fc"
+SRCREV = "7107f7501df329cf785cec1585767e5d7cbab6c2"
BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 4cab7877..9597ac16 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtdeclarative qtwebsockets"
-SRCREV = "aa490ada3793fc3528bdfefb90479c711cc0c325"
+SRCREV = "b376dfa4242db85269d138f7e9a77f5bb13964b6"
diff --git a/recipes-qt/qt5/qtwebengine/0004-Fix-linker-too-long-argument-list.patch b/recipes-qt/qt5/qtwebengine/0004-Fix-linker-too-long-argument-list.patch
new file mode 100644
index 00000000..f42a1d19
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0004-Fix-linker-too-long-argument-list.patch
@@ -0,0 +1,46 @@
+From deb9d4818d5206314f290f22330ed3b7fc33d338 Mon Sep 17 00:00:00 2001
+From: Michal Klocek <michal.klocek@qt.io>
+Date: Thu, 16 May 2019 21:58:06 +0200
+Subject: [PATCH] Fix linker too long argument list
+
+For yocto builds linker can get quite long path
+since all archives are listed as absolute paths.
+This can end up as "execvp: /bin/sh: Argument list too long"
+
+Use rsp files also for archives.
+
+Change-Id: I096e2f35ed72b68261bf465e84baddd1f78cd917
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ src/core/core_module.pro | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/src/core/core_module.pro b/src/core/core_module.pro
+index e2fa3494..10169a49 100644
+--- a/src/core/core_module.pro
++++ b/src/core/core_module.pro
+@@ -25,14 +25,17 @@ isEmpty(NINJA_LIBS): error("Missing library files from QtWebEngineCore linking p
+ NINJA_OBJECTS = $$eval($$list($$NINJA_OBJECTS))
+ # Do manual response file linking for macOS and Linux
+
+-RSP_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}.rsp
+-for(object, NINJA_OBJECTS): RSP_CONTENT += $$object
+-write_file($$RSP_FILE, RSP_CONTENT)
+-macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_FILE)
+-linux:LIBS_PRIVATE += @$$RSP_FILE
++RSP_OBJECT_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}_o.rsp
++for(object, NINJA_OBJECTS): RSP_O_CONTENT += $$object
++write_file($$RSP_OBJECT_FILE, RSP_O_CONTENT)
++RSP_ARCHIVE_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}_a.rsp
++for(archive, NINJA_ARCHIVES): RSP_A_CONTENT += $$archive
++write_file($$RSP_ARCHIVE_FILE, RSP_A_CONTENT)
++macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_OBJECT_FILE)
++linux:LIBS_PRIVATE += @$${RSP_OBJECT_FILE}
+ # QTBUG-58710 add main rsp file on windows
+-win32:QMAKE_LFLAGS += @$$RSP_FILE
+-linux: LIBS_PRIVATE += -Wl,--start-group $$NINJA_ARCHIVES -Wl,--end-group
++win32:QMAKE_LFLAGS += @$${RSP_OBJECT_FILE}
++linux: LIBS_PRIVATE += -Wl,--start-group @$${RSP_ARCHIVE_FILE} -Wl,--end-group
+ else: LIBS_PRIVATE += $$NINJA_ARCHIVES
+ LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS
+ # GN's LFLAGS doesn't always work across all the Linux configurations we support.
diff --git a/recipes-qt/qt5/qtwebengine/0005-Make-linker-call-look-great-again.patch b/recipes-qt/qt5/qtwebengine/0005-Make-linker-call-look-great-again.patch
new file mode 100644
index 00000000..74afaac1
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0005-Make-linker-call-look-great-again.patch
@@ -0,0 +1,115 @@
+From 9ef91351545ef5543b469ef24282334b3d068a2b Mon Sep 17 00:00:00 2001
+From: Michal Klocek <michal.klocek@qt.io>
+Date: Fri, 17 May 2019 15:49:23 +0200
+Subject: [PATCH] Make linker call look great again
+
+Fix issues with messed up linker path:
+
+ * do not use LIBS_PRIVATE on linux at least for passing object
+ and archive responses files.
+ * do not use QT and QT_PRIVATE with same libs, it simply
+ includes libs in LIB and LIB_PRIVATE so doubles linker libs.
+ * remove bogus dependency for gui and core for webengineheaders pseudo module.
+ * remove unused egl config flag
+
+Fixes: QTBUG-75832
+Task-number: QTBUG-75357
+Change-Id: I1720394e636e3f89d546f372b10932dd4ad395fe
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ src/core/core_chromium.pri | 2 --
+ src/core/core_common.pri | 4 ++--
+ src/core/core_headers.pro | 1 +
+ src/core/core_module.pro | 13 ++++++-------
+ 4 files changed, 9 insertions(+), 11 deletions(-)
+
+diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri
+index 4d8db0d1..d8ef25d8 100644
+--- a/src/core/core_chromium.pri
++++ b/src/core/core_chromium.pri
+@@ -33,8 +33,6 @@ RCC_DIR = $$OUT_PWD/$$getConfigDir()/.rcc
+ # whenever we are cross compiling.
+ qtConfig(webengine-embedded-build): DEFINES += QTWEBENGINE_EMBEDDED_SWITCHES
+
+-qtConfig(egl): CONFIG += egl
+-
+ INCLUDEPATH += $$PWD $$PWD/api
+
+ clang_cl {
+diff --git a/src/core/core_common.pri b/src/core/core_common.pri
+index 8375d89e..51f5e21b 100644
+--- a/src/core/core_common.pri
++++ b/src/core/core_common.pri
+@@ -2,8 +2,8 @@
+ # gyp/ninja will take care of the compilation, qmake/make will finish with linking and install.
+
+ TARGET = QtWebEngineCore
+-QT += qml quick
+-QT_PRIVATE += quick-private gui-private core-private webenginecoreheaders-private
++QT += qml-private quick-private gui-private core-private
++QT_PRIVATE += webenginecoreheaders-private
+
+ qtConfig(webengine-geolocation): QT += positioning
+ qtConfig(webengine-webchannel): QT += webchannel
+diff --git a/src/core/core_headers.pro b/src/core/core_headers.pro
+index 21b5d58c..cd5352eb 100644
+--- a/src/core/core_headers.pro
++++ b/src/core/core_headers.pro
+@@ -1,5 +1,6 @@
+ TARGET = QtWebEngineCore
+ CONFIG += no_private_module header_module internal_module no_plist
++QT -= core gui
+ MODULE = webenginecoreheaders
+ MODULE_CFG_FILE = qtwebenginecore-config
+ load(qt_module)
+diff --git a/src/core/core_module.pro b/src/core/core_module.pro
+index 10169a49..2bfbc65b 100644
+--- a/src/core/core_module.pro
++++ b/src/core/core_module.pro
+@@ -10,8 +10,6 @@ linking_pri = $$OUT_PWD/$$getConfigDir()/$${TARGET}.pri
+ error("Could not find the linking information that gn should have generated.")
+ }
+
+-load(qt_module)
+-
+ api_library_name = qtwebenginecoreapi$$qtPlatformTargetSuffix()
+ api_library_path = $$OUT_PWD/api/$$getConfigDir()
+
+@@ -32,10 +30,10 @@ RSP_ARCHIVE_FILE = $$OUT_PWD/$$getConfigDir()/$${TARGET}_a.rsp
+ for(archive, NINJA_ARCHIVES): RSP_A_CONTENT += $$archive
+ write_file($$RSP_ARCHIVE_FILE, RSP_A_CONTENT)
+ macos:LIBS_PRIVATE += -Wl,-filelist,$$shell_quote($$RSP_OBJECT_FILE)
+-linux:LIBS_PRIVATE += @$${RSP_OBJECT_FILE}
++linux:QMAKE_LFLAGS += @$${RSP_OBJECT_FILE}
+ # QTBUG-58710 add main rsp file on windows
+ win32:QMAKE_LFLAGS += @$${RSP_OBJECT_FILE}
+-linux: LIBS_PRIVATE += -Wl,--start-group @$${RSP_ARCHIVE_FILE} -Wl,--end-group
++linux:QMAKE_LFLAGS += -Wl,--start-group @$${RSP_ARCHIVE_FILE} -Wl,--end-group
+ else: LIBS_PRIVATE += $$NINJA_ARCHIVES
+ LIBS_PRIVATE += $$NINJA_LIB_DIRS $$NINJA_LIBS
+ # GN's LFLAGS doesn't always work across all the Linux configurations we support.
+@@ -74,7 +72,7 @@ osx {
+ # API library as response file to the linker.
+ QMAKE_LFLAGS += @$${api_library_path}$${QMAKE_DIR_SEP}$${api_library_name}.lib.objects
+ } else {
+- LIBS_PRIVATE += -Wl,-whole-archive -l$$api_library_name -Wl,-no-whole-archive
++ QMAKE_LFLAGS += -Wl,-whole-archive -l$$api_library_name -Wl,-no-whole-archive
+ }
+
+ win32 {
+@@ -87,8 +85,6 @@ win32 {
+ # and doesn't let Chromium get access to libc symbols through dlsym.
+ CONFIG -= bsymbolic_functions
+
+-qtConfig(egl): CONFIG += egl
+-
+ linux:qtConfig(separate_debug_info): QMAKE_POST_LINK="cd $(DESTDIR) && $(STRIP) --strip-unneeded $(TARGET)"
+
+ REPACK_DIR = $$OUT_PWD/$$getConfigDir()
+@@ -157,3 +153,6 @@ OTHER_FILES = \
+ $$files(../3rdparty/chromium/*.gypi, true) \
+ $$files(../3rdparty/chromium/*.gn, true) \
+ $$files(../3rdparty/chromium/*.gni, true)
++
++load(qt_module)
++
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index b071113c..3d4e20d3 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -139,6 +139,8 @@ QT_MODULE_BRANCH_CHROMIUM = "73-based"
SRC_URI += " \
${QT_GIT}/qtwebengine-chromium.git;name=chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
file://0001-Force-host-toolchain-configuration.patch \
+ file://0004-Fix-linker-too-long-argument-list.patch \
+ file://0005-Make-linker-call-look-great-again.patch \
"
SRC_URI_append_libc-musl = "\
file://0002-musl-don-t-use-pvalloc-as-it-s-not-available-on-musl.patch \
@@ -172,8 +174,8 @@ SRC_URI_append_libc-musl = "\
file://chromium/0018-chromium-musl-pread-pwrite.patch;patchdir=src/3rdparty \
"
-SRCREV_qtwebengine = "aef55c4091f252231718369b382dd8f401f206e3"
-SRCREV_chromium = "3d95374cb8de20b3e15538f1ecb5b78bf9d1cdcb"
+SRCREV_qtwebengine = "a69029cf9fcfd0c1fcdaafe5cbcbff2d5dd6b5c5"
+SRCREV_chromium = "82d848eb4fe3aae8c72a91b2d30c91b407ac5593"
SRCREV = "${SRCREV_qtwebengine}"
SRCREV_FORMAT = "qtwebengine_chromium"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index e42c8d9f..c9b21680 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase qtdeclarative"
-SRCREV = "6dd15c9f1bfdc010e4cd4b8158435063a5a7d229"
+SRCREV = "7981286485f6fa958133718d31dc3a2c2cc21d8f"
diff --git a/recipes-qt/qt5/qtwebview_git.bb b/recipes-qt/qt5/qtwebview_git.bb
index 7966816a..ca637397 100644
--- a/recipes-qt/qt5/qtwebview_git.bb
+++ b/recipes-qt/qt5/qtwebview_git.bb
@@ -19,4 +19,4 @@ COMPATIBLE_MACHINE_armv7a = "(.*)"
COMPATIBLE_MACHINE_armv7ve = "(.*)"
COMPATIBLE_MACHINE_aarch64 = "(.*)"
-SRCREV = "9dcc803346ab9c999ada37e06e2a508dc61307f5"
+SRCREV = "d1fc6826660b8c52df4c3b0deb2ab650e0b46767"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index 94d59175..23b3c774 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -12,4 +12,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
-SRCREV = "e1e4d843a0d9b18d29c4c8e45bc3c1e5fcabc863"
+SRCREV = "821e5be0cb9b87def6dbbe1b59a0a3659a2b13ea"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 09f0ef94..25aae60d 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -25,7 +25,7 @@ do_configure_prepend() {
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtdeclarative', 'CONFIG+=OE_QTDECLARATIVE_ENABLED', '', d)}"
-SRCREV = "1a2dca888989cd332053d4738e24cd81779cf008"
+SRCREV = "fe0475651556878b8b80b38058e5fa743822ddce"
BBCLASSEXTEND =+ "native nativesdk"