qt6: update submodules

Latest from dev branches.

Assimp is used from upstream/master branch which contains
fix for missing exception header.

Change-Id: I21ef3f62caed80391fbaa301bf972e659a6fa6fc
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

recipes-qt/qt6/qt3d_git.bb

@@ -3,7 +3,7 @@ LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \
     file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
     file://LICENSE.GPL;md5=c96076271561b0e3785dad260634eaa8 \
-    file://src/3rdparty/assimp/src/LICENSE;md5=de63670479d9e7a0c4bbf593b7e1c1cd \
+    file://src/3rdparty/assimp/src/LICENSE;md5=d9d5275cab4fb13ae624d42ce64865de \
 "
 
 inherit qt6-cmake
@@ -14,7 +14,7 @@ REQUIRED_DISTRO_FEATURES = "opengl"
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-ASSIMP_BRANCH = "qt6.1_assimp"
+ASSIMP_BRANCH = "upstream/master"
 
 SRC_URI += " \
     ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
@@ -27,5 +27,5 @@ PACKAGECONFIG[system-assimp] = "-DFEATURE_qt3d_system_assimp=ON,-DQT_FEATURE_qt3
 PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
 
 SRCREV_FORMAT = "qt3d_assimp"
-SRCREV_qt3d = "ee34f20ab67f3ff09db3e9250f7e5901bafe374c"
-SRCREV_assimp = "1620a72e5820d7c680f6f5da10a3481ceb4e53c2"
+SRCREV_qt3d = "1880d0eb8c3a2f4482e7e03b16c18612c1f10d7b"
+SRCREV_assimp = "38dc92c5c94442d4eeedf2012450079fd0e63c48"

recipes-qt/qt6/qt5compat_git.bb

@@ -19,4 +19,4 @@ PACKAGECONFIG[iconv] = "-DFEATURE_iconv=ON,-DFEATURE_iconv=OFF,virtual/libiconv"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "989cf9a58a022f02c5f5a40d0805a839942cf9aa"
+SRCREV = "eaf9406929aed85baba836a9f241d90354a4d3cc"

recipes-qt/qt6/qtbase_git.bb

@@ -152,4 +152,4 @@ FILES_${PN}-tools += "\
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "9db7cc79a26ced4997277b5c206ca15949133240"
+SRCREV = "75d8623752e67a39e2ee04e5233dc502e63a17f1"

recipes-qt/qt6/qtcharts_git.bb

@@ -13,4 +13,4 @@ DEPENDS += "qtbase"
 PACKAGECONFIG ?= "qml"
 PACKAGECONFIG[qml] = ",,qtdeclarative"
 
-SRCREV = "b18aff8da6550ac02171bc70116110df5456ac08"
+SRCREV = "8ce2fd52e0d5ea8189c193db0138488bafedbd10"

recipes-qt/qt6/qtcoap_git.bb

@@ -12,4 +12,4 @@ DEPENDS += "qtbase"
 
 PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative"
 
-SRCREV = "7e5e007b9b93591e4e59efdb33a9bfaade6414ab"
+SRCREV = "0b50991d4efc6dcbaabcbc9daa94d6b5f5127325"

recipes-qt/qt6/qtconnectivity_git.bb

@@ -17,4 +17,4 @@ DEPENDS += "qtbase qtdeclarative"
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
 PACKAGECONFIG[bluez] = "-DFEATURE_bluez=ON,-DFEATURE_bluez=OFF,bluez5"
 
-SRCREV = "2423f9da789b3a7be9e76c94884f791254cedb43"
+SRCREV = "c919794edcc7fb17c2fef94665e94993ee17f364"

recipes-qt/qt6/qtdatavis3d_git.bb

@@ -10,4 +10,4 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "7953e45cb47fd264d446dcbe7c5186cef8987e5b"
+SRCREV = "54e3c62734cb950e08a3f930880d08b9e2854e35"

recipes-qt/qt6/qtdeclarative_git.bb

@@ -16,4 +16,4 @@ DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "54cfca2eca7168e35d14d00197ae669fc75073b0"
+SRCREV = "1d44ddf57671399a9fa3a7dadab8d448ce7b52e7"

recipes-qt/qt6/qtdeviceutilities_git.bb

@@ -8,4 +8,4 @@ include recipes-qt/qt6/qt6-git.inc
 DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtvirtualkeyboard"
 RDEPENDS_${PN} = "connman"
 
-SRCREV = "57c420b461b35b89cd9866c7ade42c1f6c51e583"
+SRCREV = "cb791709c0c0a5ac501a477f07adad14565e41bc"

recipes-qt/qt6/qtimageformats_git.bb

@@ -24,4 +24,4 @@ PACKAGECONFIG[mng] = "-DFEATURE_mng=ON,-DFEATURE_mng=OFF,libmng"
 PACKAGECONFIG[tiff] = "-DFEATURE_tiff=ON,-DFEATURE_libtiff=OFF,tiff"
 PACKAGECONFIG[webp] = "-DFEATURE_webp=ON,-DFEATURE_webp=OFF,libwebp"
 
-SRCREV = "dcc601a0aff2ce24c06eb9bf5ec7b4f18b28f786"
+SRCREV = "4d3097722d6448adb582acefcf8372568af2ffcc"

recipes-qt/qt6/qtlottie_git.bb

@@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "6445002590f0ddc7c7fb9c65ef3079d21ac2e70f"
+SRCREV = "759f1b5caa14d4145c6634a5af84037ad98b9ba9"

recipes-qt/qt6/qtmqtt_git.bb

@@ -13,4 +13,4 @@ DEPENDS += "qtbase"
 
 PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets"
 
-SRCREV = "72bdbb7fa7e5927bd16c6ccac88d87975a185b0f"
+SRCREV = "d18a233e93e05e11e0d2b318ad7cf75231d23847"

recipes-qt/qt6/qtmultimedia/0001-CMake-deploy-libfftreal.patch

@@ -1,37 +0,0 @@
-From b16fd97db7a0e79d06cac888d31b4d45b1366918 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Fri, 26 Mar 2021 08:03:34 +0200
-Subject: [PATCH] CMake: deploy libfftreal
-
-Change-Id: I37e8e81145c228c9709b42ee59a7d1dbc0878d02
----
- .../spectrum/3rdparty/fftreal/CMakeLists.txt         | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/examples/multimedia/spectrum/3rdparty/fftreal/CMakeLists.txt b/examples/multimedia/spectrum/3rdparty/fftreal/CMakeLists.txt
-index 35135b1c..4c45fd11 100644
---- a/examples/multimedia/spectrum/3rdparty/fftreal/CMakeLists.txt
-+++ b/examples/multimedia/spectrum/3rdparty/fftreal/CMakeLists.txt
-@@ -35,6 +35,12 @@ qt_add_cmake_library(fftreal
- # TEMPLATE = "lib"
- # target.path = "$$[QT_INSTALL_EXAMPLES]/multimedia/spectrum"
- 
-+if(NOT DEFINED INSTALL_EXAMPLESDIR)
-+  set(INSTALL_EXAMPLESDIR "examples")
-+endif()
-+
-+set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/multimedia/spectrum")
-+
- ## Scopes:
- #####################################################################
- 
-@@ -56,3 +62,9 @@ qt_extend_target(fftreal CONDITION WIN32
- 
- #### Keys ignored in scope 11:.:../..:../../spectrum.pri:CONFIG(debug,release OR debug):
- # spectrum_build_dir = "/debug"
-+
-+install(TARGETS fftreal
-+    RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
-+    BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"
-+    LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}"
-+)

recipes-qt/qt6/qtmultimedia_git.bb

@@ -14,11 +14,7 @@ include recipes-qt/qt6/qt6.inc
 
 QT_MODULE_BRANCH = "wip/qt6"
 
-SRC_URI += "\
-    file://0001-CMake-deploy-libfftreal.patch \
-"
-
-DEPENDS += "qtbase"
+DEPENDS += "qtbase qtshadertools qtshadertools-native"
 
 PACKAGECONFIG ?= "gstreamer qml"
 PACKAGECONFIG[alsa] = "-DFEATURE_alsa=ON,-DFEATURE_alsa=OFF,alsa-lib"
@@ -26,4 +22,4 @@ PACKAGECONFIG[pulseaudio] = "-DFEATURE_pulseaudio=ON,-DFEATURE_pulseaudio=OFF,pu
 PACKAGECONFIG[gstreamer] = "-DFEATURE_gstreamer=ON,-DFEATURE_gstreamer=OFF,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
 PACKAGECONFIG[qml] = ",,qtdeclarative"
 
-SRCREV = "6d2c0dd4ecd437baedea43c92f47ec8f5f268514"
+SRCREV = "21b7de9216abcec737c9a3f9564a6465395d8e5a"

recipes-qt/qt6/qtnetworkauth_git.bb

@@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-SRCREV = "94d037bb2acf9e460f59a73a21d16a8d6b0433a3"
+SRCREV = "a07ac50e3201f8a354c71a93153807d7189c8197"

recipes-qt/qt6/qtopcua_git.bb

@@ -21,4 +21,4 @@ SECURITY_STRINGFORMAT = ""
 
 DEPENDS += "qtbase"
 
-SRCREV = "4be6408e388669052e3ee65026fac9035e645e15"
+SRCREV = "2fa70690751ba535da7e150f2a78209634cf4cfc"

recipes-qt/qt6/qtpositioning_git.bb

@@ -23,4 +23,4 @@ PACKAGECONFIG[gypsy] = "-DFEATURE_gypsy=ON,-DFEATURE_gypsy=OFF,gconf gypsy"
 PACKAGECONFIG[nmea] = ",,qtserialport"
 PACKAGECONFIG[qml] = ",,qtdeclarative"
 
-SRCREV = "50864c2dd1401321c18af6711b210a676addcde3"
+SRCREV = "11bf741613a65c3bf5050dcfddc2ad2731f409d0"

recipes-qt/qt6/qtquick3d/0001-CMake-allow-tools-build-without-opengl.patch

@@ -1,4 +1,4 @@
-From d0c606eb0a080c1d945ea4419a9acffd6fa81052 Mon Sep 17 00:00:00 2001
+From d46cce72f353a92b6175dbb90a39ce9e599ed53d Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Fri, 28 Aug 2020 14:49:11 +0300
 Subject: [PATCH] CMake: allow tools build without opengl
@@ -7,11 +7,12 @@ Change-Id: I76d750b5bd29103133578152241c11bc35b14552
 ---
  CMakeLists.txt                 | 5 -----
  tools/balsam/CMakeLists.txt    | 1 -
+ tools/instancer/CMakeLists.txt | 1 -
  tools/meshdebug/CMakeLists.txt | 1 -
- 3 files changed, 7 deletions(-)
+ 4 files changed, 8 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f4574c6d..ccae7f0a 100644
+index 49ef7111..5b30ed57 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -34,11 +34,6 @@ if(NOT TARGET Qt::Quick)
@@ -38,6 +39,18 @@ index e387eb92..47c513fb 100644
          Qt::Gui
          Qt::Quick3DAssetImportPrivate
          Qt::Quick3DIblBakerPrivate
+diff --git a/tools/instancer/CMakeLists.txt b/tools/instancer/CMakeLists.txt
+index 997869e4..0dd6eed4 100644
+--- a/tools/instancer/CMakeLists.txt
++++ b/tools/instancer/CMakeLists.txt
+@@ -9,7 +9,6 @@ qt_internal_add_tool(${target_name}
+         main.cpp
+     PUBLIC_LIBRARIES
+         Qt::Qml # special case
+-        Qt::OpenGL # special case
+         Qt::Gui
+         Qt::Quick3DPrivate
+ )
 diff --git a/tools/meshdebug/CMakeLists.txt b/tools/meshdebug/CMakeLists.txt
 index 812155ef..b497e9a4 100644
 --- a/tools/meshdebug/CMakeLists.txt

recipes-qt/qt6/qtquick3d_git.bb

@@ -1,7 +1,7 @@
 LICENSE = "BSD-3-Clause & ( GFDL-1.3 & BSD & GPL-3.0 | The-Qt-Company-Commercial )"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://src/3rdparty/assimp/src/LICENSE;md5=de63670479d9e7a0c4bbf593b7e1c1cd \
+    file://src/3rdparty/assimp/src/LICENSE;md5=d9d5275cab4fb13ae624d42ce64865de \
 "
 
 inherit qt6-cmake
@@ -9,7 +9,7 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-ASSIMP_BRANCH = "qt6.1_assimp"
+ASSIMP_BRANCH = "upstream/master"
 
 SRC_URI += " \
     ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
@@ -27,5 +27,5 @@ FILES_${PN}-qmlplugins += " \
 "
 
 SRCREV_FORMAT = "qtquick3d_assimp"
-SRCREV_qtquick3d = "86ba4c1f6843db0b8fa3884832cb128a6ee81cef"
-SRCREV_assimp = "1620a72e5820d7c680f6f5da10a3481ceb4e53c2"
+SRCREV_qtquick3d = "a78b3771b6e24166674e66193c2320fd3014c40a"
+SRCREV_assimp = "38dc92c5c94442d4eeedf2012450079fd0e63c48"

recipes-qt/qt6/qtquickcontrols2_git.bb

@@ -12,4 +12,4 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS = "qtbase qtdeclarative"
 
-SRCREV = "f42abbcb7794bcfc884e8aee75f73bd9ab8fbda4"
+SRCREV = "37d3c7817fbde6db9f95863d1d0f3d6d9b96cea3"

recipes-qt/qt6/qtquickdesigner-components_git.bb

@@ -13,4 +13,4 @@ QT_MODULE_BRANCH = "dev"
 
 DEPENDS += "qtbase qtdeclarative qtquickcontrols2"
 
-SRCREV = "4e5ecf812bc8019ddf851f3603c65db76b2b5b9c"
+SRCREV = "e80796525e74265536393e13472be01d150df242"

recipes-qt/qt6/qtquicktimeline_git.bb

@@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS = "qtbase qtdeclarative"
 
-SRCREV = "75df361940daca93e2430396719d3c7b53b5a642"
+SRCREV = "29a3339ad80dc934733c9a77266b8c5803ae412c"

recipes-qt/qt6/qtremoteobjects_git.bb

@@ -13,6 +13,6 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
 
-SRCREV = "3a04db8964c73574502ffa76a9f90f2a7ce016aa"
+SRCREV = "9062f3eb75a1959c78107dfd6e13b6fa6b1a8711"
 
 BBCLASSEXTEND += "native nativesdk"

recipes-qt/qt6/qtscxml_git.bb

@@ -18,4 +18,4 @@ PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "345f974fa2c5f0f909f5abe1861bf343dccac3b9"
+SRCREV = "0654884519446190051ba791c56354ccb3e8425f"

recipes-qt/qt6/qtsensors_git.bb

@@ -14,4 +14,4 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "8eb278dcb1bd1d26d2cdcd625767297560a43f98"
+SRCREV = "bc43937fe9d085ff1068420d6f43972fb1297bba"

recipes-qt/qt6/qtserialbus_git.bb

@@ -15,4 +15,4 @@ DEPENDS += "qtbase qtserialport qtserialbus-native"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "93c5fedba1618bad1e6e3aaeff279a51c75f5e81"
+SRCREV = "ab7449bbbee034fe3850088bd9c3d80bfac7709e"

recipes-qt/qt6/qtserialport_git.bb

@@ -16,4 +16,4 @@ DEPENDS += "qtbase"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "d8f276627a788d435169008952fc75c693c21c79"
+SRCREV = "4411ba1258db89d2a086fc324e47285ce59b3dbf"

recipes-qt/qt6/qtshadertools_git.bb

@@ -12,4 +12,4 @@ DEPENDS = "qtbase qtshadertools-native"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "a6003e093e527c23407f868ba711e19fcc2d65ac"
+SRCREV = "db5408b3e925515c7e2468cf6c60d953770ec1b1"

recipes-qt/qt6/qtsvg_git.bb

@@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-SRCREV = "d62f04f22fc1b84229d8c42aa730ec77cf68a151"
+SRCREV = "7063de4f39c2915a69ce4bfad992c2e44df9dccb"

recipes-qt/qt6/qttools_git.bb

@@ -12,10 +12,19 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
+SRC_URI += " \
+    ${QT_GIT}/playground/qlitehtml.git;name=qlitehtml;branch=master;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/assistant/qlitehtml \
+    git://github.com/litehtml/litehtml.git;name=litehtml;branch=master;destsuffix=git/src/assistant/qlitehtml/src/3rdparty/litehtml \
+"
+
 DEPENDS += "qtbase qtdeclarative qttools-native"
 
 FILES_${PN}-tools += "${QT6_INSTALL_DATADIR}/phrasebooks"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "ed92701d67becc93e8ed16bc697d438918e701d9"
+SRCREV_FORMAT = "qttools_qlitehtml_litehtml"
+
+SRCREV_qttools = "0de5a1d53e2efa0c75c8a02a09f176a7bcc1988f"
+SRCREV_qlitehtml = "03e1be309c35d8d8653966fa0fe999f978ef679d"
+SRCREV_litehtml = "b4c815c0ed7e2140bc4a239be01f01c00b9cf431"

recipes-qt/qt6/qttranslations_git.bb

@@ -25,4 +25,4 @@ python split_translation_packages () {
     d.setVar('RRECOMMENDS_' + pn, ' '.join(pkgs))
 }
 
-SRCREV = "cab9d06e9c99cb7b8acfb4a93ac3eacabdd07143"
+SRCREV = "e4f44737814b09ac2a94906b735d8fd6b991ed8d"

recipes-qt/qt6/qtvirtualkeyboard_git.bb

@@ -116,4 +116,4 @@ FILES_${PN}-dictionaries = "${QT6_INSTALL_DATADIR}/qtvirtualkeyboard/*/*.dat"
 
 DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native"
 
-SRCREV = "982a9f202780a1f5b3e40f8acf2f9430f18ef35b"
+SRCREV = "bb8de5bb1efe1245b9ac316beff959cd0d7129dd"

recipes-qt/qt6/qtwayland_git.bb

@@ -37,4 +37,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "da31aa6544f38c063de93326f958e8cbb02004af"
+SRCREV = "d6e074d0d35221b0fac14c94fc79c98363f2f6c3"

recipes-qt/qt6/qtwebchannel_git.bb

@@ -18,4 +18,4 @@ PACKAGECONFIG ?= "qml"
 PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets"
 PACKAGECONFIG[qml] = ",,qtdeclarative"
 
-SRCREV = "85fb5a65ee4cabd0eb319a840b82145d1f4567c1"
+SRCREV = "491d4e8dd223f428b95e8a26af2c44692687f248"

recipes-qt/qt6/qtwebsockets_git.bb

@@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtdeclarative"
 
-SRCREV = "8dc02dd7361bced229c10da4e0ed093892d7761e"
+SRCREV = "7e33da9915f4f68381d24fb859aa621cbe9ca6fd"