Update submodule refs on '6.10.0' in yocto/meta-qt6

Change-Id: Ib2f974b871c2b99c43b7247dcfbcd058f6ef9538
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>

README.md

@@ -20,22 +20,22 @@ Following table shows the Yocto releases which are used to test each
 Qt version (x) and any additional Yocto releases that are stated in
 the LAYERSERIES_COMPAT (c).
 
-| Yocto \ Qt | dev | 6.9  | 6.8 | 6.7 | 6.6 | 6.5 | 6.4 | 6.3 | 6.2 |
-|:---------- |:---:|:----:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-| whinlatter |  x  |  x   |  x  |     |     |     |     |     |     |
-| walnascar  |  x  |  x   |  x  |     |     |     |     |     |     |
-| styhead    |  x  |  x   |  x  |  c  |     |     |     |     |     |
-| scarthgap  |  x  |  x   |  x  |  c  |  c  |  x  |     |     |     |
-| nanbield   |  c  |  c   |  c  |  c  |  c  |  c  |     |     |     |
-| mickledore |  c  |  c   |  c  |  c  |  c  |  c  |  c  |     |     |
-| langdale   |  c  |  c   |  c  |  c  |  c  |  c  |  c  |     |     |
-| kirkstone  |  x  |  x   |  x  |  c  |  c  |  x  |  c  |  c  |  c  |
-| honister   |     |      |     |     |  c  |  c  |  c  |  c  |  c  |
-| hardknott  |     |      |     |     |  c  |  c  |  c  |  c  |  c  |
-| gatesgarth |     |      |     |     |  c  |  c  |  c  |  c  |  c  |
-| dunfell    |     |      |     |     |  c  |  x  |  c  |  c  |  c  |
-|            |     |      |     |     |     |     |     |     |     |
-|            | dev |stable| LTS | EOL | EOL | LTS | EOL | EOL | EOL |
+| Yocto \ Qt | 6.10 | 6.9  | 6.8 | 6.7 | 6.6 | 6.5 | 6.4 | 6.3 | 6.2 |
+|:---------- |:----:|:----:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
+| whinlatter |  x   |  x   |  x  |     |     |     |     |     |     |
+| walnascar  |  x   |  x   |  x  |     |     |     |     |     |     |
+| styhead    |  x   |  x   |  x  |  c  |     |     |     |     |     |
+| scarthgap  |  x   |  x   |  x  |  c  |  c  |  x  |     |     |     |
+| nanbield   |  c   |  c   |  c  |  c  |  c  |  c  |     |     |     |
+| mickledore |  c   |  c   |  c  |  c  |  c  |  c  |  c  |     |     |
+| langdale   |  c   |  c   |  c  |  c  |  c  |  c  |  c  |     |     |
+| kirkstone  |  x   |  x   |  x  |  c  |  c  |  x  |  c  |  c  |  c  |
+| honister   |      |      |     |     |  c  |  c  |  c  |  c  |  c  |
+| hardknott  |      |      |     |     |  c  |  c  |  c  |  c  |  c  |
+| gatesgarth |      |      |     |     |  c  |  c  |  c  |  c  |  c  |
+| dunfell    |      |      |     |     |  c  |  x  |  c  |  c  |  c  |
+|            |      |      |     |     |     |     |     |     |     |
+|            |stable|stable| LTS | EOL | EOL | LTS | EOL | EOL | EOL |
 
 Detailed status of supported Qt versions can be found from
 https://doc.qt.io/qt-6/supported-platforms.html#supported-qt-versions

conf/layer.conf

@@ -35,12 +35,10 @@ LAYERVERSION_qt6-layer = "1"
 
 LAYERDEPENDS_qt6-layer = "core openembedded-layer meta-python"
 
-LAYERSERIES_COMPAT_qt6-layer = "kirkstone langdale mickledore nanbield scarthgap styhead walnascar"
+LAYERSERIES_COMPAT_qt6-layer = "kirkstone langdale mickledore nanbield scarthgap styhead walnascar whinlatter"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
-IMAGE_FEATURES[validitems] += "qtcreator-debug"
-
 # Set a variable to get to the top of the metadata location
 QT6BASE := "${LAYERDIR}"
 

recipes-core/minizip/minizip_1.2.11.bb

@@ -6,10 +6,10 @@ SECTION = "libs"
 LICENSE = "Zlib"
 LIC_FILES_CHKSUM = "file://zip.h;beginline=14;endline=30;md5=8eaa8535a3a1a2296b303f40f75385e7"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/zlib/${PV}/zlib-${PV}.tar.xz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/zlib/${PV}/zlib-${PV}.tar.xz;subdir=${BP};striplevel=1"
 UPSTREAM_CHECK_URI = "http://zlib.net/"
 
-S = "${WORKDIR}/zlib-${PV}/contrib/minizip"
+S .= "/contrib/minizip"
 
 SRC_URI[md5sum] = "85adef240c5f370b308da8c938951a68"
 SRC_URI[sha256sum] = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"

recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-addons.bb

@@ -13,6 +13,8 @@ RDEPENDS:${PN} += " \
     nativesdk-qtapplicationmanager-tools \
     nativesdk-qtgrpc-dev \
     nativesdk-qtgrpc-tools \
+    nativesdk-qtlottie-dev \
+    nativesdk-qtlottie-tools \
     nativesdk-qtquick3d-dev \
     nativesdk-qtquick3d-tools \
     nativesdk-qtopcua-dev \
@@ -23,7 +25,6 @@ RDEPENDS:${PN} += " \
     nativesdk-qtscxml-tools \
     nativesdk-qtshadertools-dev \
     nativesdk-qtshadertools-tools \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-qtwayland-dev nativesdk-qtwayland-tools', '', d)} \
     ${FORLINUXHOST} \
 "
 

recipes-qt/qt6/qt3d_git.bb

@@ -24,7 +24,7 @@ include recipes-qt/qt6/qt6.inc
 ASSIMP_BRANCH = "qt6_assimp"
 
 SRC_URI += " \
-    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qt3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
+    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qt3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/3rdparty/assimp/src \
 "
 
 # Needed for supporting 64bit off_t

recipes-qt/qt6/qt6-git.inc

@@ -4,69 +4,70 @@ HOMEPAGE ?= "https://www.qt.io"
 inherit srcrev-update
 
 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "dev"
+QT_MODULE_BRANCH ?= "6.10"
 QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
 QT_MODULE_REPO ?= "${QT_MODULE}.git"
 
-SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}"
+# for compatibility with Yocto releases before whinlatter
+BB_GIT_DEFAULT_DESTSUFFIX ?= "${BP}"
+
+SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}"
 
 CVE_PRODUCT ?= "qt:${BPN} qt:qt"
 
-S = "${WORKDIR}/git"
-
 PV = "${QT_VERSION}"
 
 SRCREV = "${SRCREV_${QT_MODULE}}"
 
-SRCREV_tqtc-qmlcompilerplus = "62f0cc04dc7d1da3707632fd240b0fca2aa33426"
-SRCREV_tqtc-qtinsighttracker = "64ac6017bc4e31f61d07501039cec0aaf6a17087"
-SRCREV_tqtc-qtvncserver = "b14bc481037187956fabf3ffe6a3aede5abc330b"
-SRCREV_qt3d = "315ed3c0904612743a7c5ee547800865ffd5e20b"
-SRCREV_qt3d-assimp = "647f94648c0ae24b9c6684383a9dbbc0e2fc23b7"
-SRCREV_qt5compat = "bd407c33e78d47eb2ffc2547f300e2ed9d4d997c"
-SRCREV_qtbase = "ccce91461a39adebde7ec7803b4cc0b97093f77f"
-SRCREV_qtapplicationmanager = "7144c68027dc113f389d73570bcdaeccaae7affd"
-SRCREV_qtcharts = "de85db072bd47f780d63d25b0113a03a10ec5ee1"
-SRCREV_qtcoap = "ce19f0a28ecb755267f601015d2a14b10cdace6f"
-SRCREV_qtconnectivity = "fa25e5809b9a55d2d2014753f1d2c5c3246b05ba"
-SRCREV_qtdatavis3d = "de145800f9a56d4bd1249eb6c4780d7b203c507c"
-SRCREV_qtdeclarative = "30d2b91fb48c2a28188f75d3e87311a2a6aba5d8"
-SRCREV_qtdeviceutilities = "8c689f05318a6d7b4bef80cdaf6038745d2357c6"
-SRCREV_qtdoc = "fa58cd1ab825316de312958d93cf4ce6d4558cf0"
-SRCREV_qtgraphs = "155b4547efea597777cc89ee353938237b7f036d"
-SRCREV_qtgrpc = "abbe99c0d05df122346f2f2452efa10bf840a90b"
-SRCREV_qthttpserver = "bd29a7f0f57c6738826419e88ce46faafd04f4dd"
-SRCREV_qtimageformats = "fa96798b387a6adbe4838eec05165645ccd8853d"
-SRCREV_qtinterfaceframework = "73efcbaf70e368c429278cc9fcc22326f9ca3269"
-SRCREV_qtlanguageserver = "b5d17027959532cbb0a78a9ebb1af1c566d451d9"
-SRCREV_qtlocation = "7a9598796d183acb0960a242fbae0231ced7055f"
-SRCREV_qtlottie = "d2436dcfe2dc8850775a92ac2cec76f57d3bc2d9"
-SRCREV_qtmqtt = "9c04ffb5c3fee0f30cee7ee7f691fba906615538"
-SRCREV_qtmultimedia = "e94cfbef6b1d9242ae8bc6ec860da7fd6dfe3834"
-SRCREV_qtnetworkauth = "e6c4d573e3adda8ea62dbdbc043f5c80ca96ebef"
-SRCREV_qtopcua = "061d7877406ae4420fba6aa6051b63043c3f0d7c"
-SRCREV_qtpositioning = "be4569c6e56969242c10ef2aefd035c7802b53a4"
-SRCREV_qtquick3d = "6476f23e274c3c3d8b41c9c7b73f50e254129c77"
-SRCREV_qtquick3d-assimp = "647f94648c0ae24b9c6684383a9dbbc0e2fc23b7"
-SRCREV_qtquick3dphysics = "0b3ffcc685f81f3d1714560a51e649e7fdeea58a"
+SRCREV_tqtc-qmlcompilerplus = "85e84072df9122b73272ff33f2e3b3d3415078c8"
+SRCREV_tqtc-qtinsighttracker = "71f3580483957e93d852bec6b3a3f6a26007e36a"
+SRCREV_tqtc-qtvncserver = "4d5eafa5c01edf09769a283531fa6b78c9791fb2"
+SRCREV_qt3d = "800cefdb7127280aa37172e984c58602bfe0ec76"
+SRCREV_qt3d-assimp = "488a2f7af2920295ada886f113a0d563dab79b8d"
+SRCREV_qt5compat = "38bd2f5de50f54dd6d14b01a337e24d5cd84cd20"
+SRCREV_qtbase = "738a49173253a5b2dc485f094db7c6fe57a03ff1"
+SRCREV_qtapplicationmanager = "2f95b2544d063134b7e85b5934382c5e21f2485a"
+SRCREV_qtcharts = "41edd360518a9668a43238ce4b242e64327cdae8"
+SRCREV_qtcoap = "3465c34866e6b8ca9123a61cffa920cd96d4b503"
+SRCREV_qtconnectivity = "f5a6f4cb65f9b5cd0687372ecd94598d77899b0b"
+SRCREV_qtdatavis3d = "a8c2e762a896eb4129801de5c8487fe6a12bdeab"
+SRCREV_qtdeclarative = "959cda5e12e8d7cb114cafebc71511cbbd066609"
+SRCREV_qtdeviceutilities = "9348f3dac198c31ce6179cb88f11da2fdbcb45f9"
+SRCREV_qtdoc = "65a8002ef4dd74e2fff007f10d34b87da2d91d99"
+SRCREV_qtgraphs = "9deae755f41c9fe55ce98d8b1c17d5524ad8005a"
+SRCREV_qtgrpc = "6d9a5cb36ddb9e875892a5f0a28c24edf3cb1dec"
+SRCREV_qthttpserver = "dd09009fa9031b8fa20620b98294042c3c708956"
+SRCREV_qtimageformats = "73f211487b3e941bdcb33f1b5138598d03b8f043"
+SRCREV_qtinterfaceframework = "d68e4d3d2e33a7bb09aee0ece5ac04d8d0c33210"
+SRCREV_qtlanguageserver = "c89ac084f92e699362ac2a8df149250e1729377a"
+SRCREV_qtlocation = "dc0e989c59fe7a115e7d5610e0cd9581f718d350"
+SRCREV_qtlottie = "ac43d20eb04c51494b675b0d16d51147bd2eeebf"
+SRCREV_qtmqtt = "7bb76f6168f84ae4e95a8a570fa4f2bc5c22cf54"
+SRCREV_qtmultimedia = "b483b3af6f627a869410f53eb154da9ac7017e8c"
+SRCREV_qtnetworkauth = "c1ac8f08e6821b6171f49f77a9dbe8ac5152256f"
+SRCREV_qtopcua = "769d4b38b288e0ef262770d709199dde8bbfdc3b"
+SRCREV_qtpositioning = "df535b1e44701da07007ea7627d9ffca86e677ae"
+SRCREV_qtquick3d = "c6876c9a0311ac37bc919eeff1303999feb52cc4"
+SRCREV_qtquick3d-assimp = "488a2f7af2920295ada886f113a0d563dab79b8d"
+SRCREV_qtquick3dphysics = "ca51bb3f7349274ad4cee1e65c213f55dfd91570"
 SRCREV_qtquickdesigner-components = "8c9e0faa0dd8b8adf019e357212e59898a7bebfb"
-SRCREV_qtquicktimeline = "4aaad7c9320b6e2688fe7dd42ce179e90ba1cceb"
-SRCREV_qtremoteobjects = "9347765c55982794709db65c0f418b00acd5a500"
-SRCREV_qtscxml = "a24a44bf6fef3ef264840124cde82cbc1e567871"
-SRCREV_qtsensors = "c2bb52c3b1972e6fb2f8d2485a5a119fdffe03ad"
-SRCREV_qtserialbus = "efdbba55eb147e934b341df22e2bb78b3bb26095"
-SRCREV_qtserialport = "b26323144248ff40edd271c9c043baa25475d644"
-SRCREV_qtshadertools = "0c841bbdbfd00edfecfd5c3d8294ee3b2aef9f83"
-SRCREV_qtspeech = "08cddcb717d2d9a9780ebc4e2ea11f088ac175a6"
-SRCREV_qtsvg = "45d219f1f83b3a832d4f2829821144ea74a852f7"
-SRCREV_qttools = "059e2e42c8625aa9c5767627ebcbc0956d89ec01"
-SRCREV_qttools-qlitehtml = "2992a310640697325791a5494ca8f4d4552de368"
+SRCREV_qtquicktimeline = "4c0e30cd4aa523f0eded06719cbb687b1bd9c54c"
+SRCREV_qtremoteobjects = "659842dbd7326ec637aa442f21b69bf574acecd7"
+SRCREV_qtscxml = "e921c6b8a4e3e757180ce6fe97a098df1f122f36"
+SRCREV_qtsensors = "37668130613e000f8075e49b8c4d5d6dadff6ac7"
+SRCREV_qtserialbus = "730d31ffb634b9331ed200d02cfdc2f21a893812"
+SRCREV_qtserialport = "7e33aa75968e2021e01e8f3df62142a735d5e0be"
+SRCREV_qtshadertools = "5184ca558e2b2c47a4977f378205508a90b37111"
+SRCREV_qtspeech = "bc01825f37840468ee6a761abed8b79be6a15a38"
+SRCREV_qtsvg = "0f5d7746d224114f5c39773c14ea11aca0240883"
+SRCREV_qttools = "82627f78fb54b26a92ca3fa99e503661e3c79eb2"
+SRCREV_qttools-qlitehtml = "3fe5821dad98747d6e41c9ed54b86c3d0eee9daf"
 SRCREV_qttools-qlitehtml-litehtml = "6ca1ab0419e770e6d35a1ef690238773a1dafcee"
-SRCREV_qttranslations = "727eda4e2f24c257b91ddb8dca1820db4150992b"
-SRCREV_qtvirtualkeyboard = "e8238f568ef7e541fce492117da8876b2b34bf42"
-SRCREV_qtwayland = "85c978dd9acfa07ed7d83b90b92a9767ab81d775"
-SRCREV_qtwebchannel = "bed96d1977bb7da20a527b52b0e5c80be65e796f"
-SRCREV_qtwebengine = "7cbc1bc4b9ab2e09880633888eacbc146e16701a"
-SRCREV_qtwebengine-chromium = "45d204bccd41e0f9ec166e47e2a15714e26f384b"
-SRCREV_qtwebsockets = "7ac0388c474dae2aae4998d762feafc63fc4411d"
-SRCREV_qtwebview = "3b7ea7f2581c5fedfa44b7cc640ed37a5fd7e6cc"
+SRCREV_qttranslations = "ca704dd4c2df93d6108a7f93a68f4b7a45dcbe6f"
+SRCREV_qtvirtualkeyboard = "0660dcb6a18d9137466b54b625a714a6174fb194"
+SRCREV_qtwayland = "736357374339eacfe6d7eb50d8bfb79c46423651"
+SRCREV_qtwebchannel = "9b51e42c0dad0c67bc426af3e99b56c8069ab309"
+SRCREV_qtwebengine = "0219f840afe67dbd15b71ce713038646c09821af"
+SRCREV_qtwebengine-chromium = "94daf4ca58c78945f30ebd4562197b9ea7443243"
+SRCREV_qtwebsockets = "25a05207b1b4beb72ac764494fa1711173dfedf8"
+SRCREV_qtwebview = "bfc1b2c6261c4bde64734b1a1b7842a8ebe84f28"

recipes-qt/qt6/qt6-ptest.inc

@@ -29,7 +29,7 @@ EOF
         ${EXTRA_OECMAKE} \
         -DQT_BUILD_STANDALONE_TESTS=ON \
         -DQT_BUILD_EXAMPLES=OFF \
-        -DQT_ADDITIONAL_PACKAGES_PREFIX_PATH=${D}${QT6_INSTALL_LIBDIR}/cmake \
+        -DQT_ADDITIONAL_PACKAGES_PREFIX_PATH=${D}${prefix} \
         -DCMAKE_STAGING_PREFIX=${D}${prefix} \
         -DCMAKE_SKIP_RPATH=ON \
         -DQT_DISABLE_NO_DEFAULT_PATH_IN_QT_PACKAGES=ON \
@@ -51,6 +51,14 @@ EOF
                 ' _ {} \;
         fi
     done
+
+    if [ -e "${B_PTEST}/${baselib}" ]; then
+        find ${B_PTEST}/${baselib} \
+            ! -type d -a \( -executable -o -name qmldir \) \
+            -exec sh -c '\
+                install -D "$1" "${D}${PTEST_PATH}${1#${B_PTEST}/${baselib}}" \
+            ' _ {} \;
+    fi
 }
 
 fakeroot python do_create_ptest_list() {
@@ -91,7 +99,7 @@ INSANE_SKIP:${PN}-ptest += "file-rdeps"
 
 PACKAGESPLITFUNCS =+ "remove_ptest_debug"
 remove_ptest_debug() {
-    if [ -e ${PKGD}${QT6_INSTALL_LIBDIR}/${BPN}/ptest/tests ]; then
-        find ${PKGD}${QT6_INSTALL_LIBDIR}/${BPN}/ptest/tests -depth -type d -name .debug -exec rm -rf '{}' \;
+    if [ -e ${PKGD}${QT6_INSTALL_LIBDIR}/${BPN}/ptest ]; then
+        find ${PKGD}${QT6_INSTALL_LIBDIR}/${BPN}/ptest -depth -type d -name .debug -exec rm -rf '{}' \;
     fi
 }

recipes-qt/qt6/qtapplicationmanager_git.bb

@@ -23,7 +23,8 @@ EXTRA_OECMAKE += "-DQT_APPMAN_SKIP_EXCLUDE_TOOLS_FROM_DEFAULT_TARGET=ON"
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'multi-process', '', d)}"
 
 PACKAGECONFIG[tools-only] = "-DFEATURE_am_tools_only=ON, -DFEATURE_am_tools_only=OFF"
-PACKAGECONFIG[multi-process] = "-DFEATURE_am_multi_process=ON, -DFEATURE_am_multi_process=OFF, qtwayland qtwayland-native"
+PACKAGECONFIG[multi-process] = "-DFEATURE_am_multi_process=ON,-DFEATURE_am_multi_process=OFF,qtwayland"
+PACKAGECONFIG[bubblewrap] = "-DFEATURE_am_bubblewrap_container=ON,-DFEATURE_am_bubblewrap_container=OFF,,bubblewrap"
 
 PACKAGECONFIG:class-native ??= "tools-only"
 PACKAGECONFIG:class-nativesdk ??= "${PACKAGECONFIG:class-native}"

recipes-qt/qt6/qtbase_git.bb

@@ -1,4 +1,5 @@
-LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only) & Apache-2.0 & BSD-3-Clause & BSL-1.0 & MIT"
+LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) \
+    & GFDL-1.3-no-invariants-only) & Apache-2.0 & BSD-3-Clause & BSL-1.0 & LGPL-2.1-or-later & HPND & MIT"
 LIC_FILES_CHKSUM = " \
     file://LICENSES/Apache-2.0.txt;md5=b4c615f64dff32f71eeed614d13dfd4c \
     file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
@@ -6,6 +7,8 @@ LIC_FILES_CHKSUM = " \
     file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
     file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/HPND.txt;md5=72f417bf093b8008321cb594117034ec \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
     file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
     file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
     file://LICENSES/MIT.txt;md5=3605d54ecceddcd50962eb89318779ec \
@@ -39,6 +42,7 @@ RRECOMMENDS:${PN}-ptest:append = " tzdata"
 
 PACKAGECONFIG:class-native ?= "\
     gui widgets jpeg png dbus no-opengl openssl zlib zstd \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwaylandscanner', '', d)} \
 "
 PACKAGECONFIG:class-nativesdk ?= "${PACKAGECONFIG:class-native}"
 PACKAGECONFIG ?= "\
@@ -60,12 +64,13 @@ PACKAGECONFIG_GRAPHICS ?= "\
     linuxfb \
 "
 PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', '', d)}"
-PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups kms gbm sql-sqlite', '', d)}"
+PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'cups kms gbm sql-sqlite', '', d)}"
 PACKAGECONFIG_FONTS ?= ""
 PACKAGECONFIG_SYSTEM ?= ""
 PACKAGECONFIG_DISTRO ?= ""
 PACKAGECONFIG_DEFAULT ?= "\
     accessibility \
+    ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'accessibility-atspi-bridge', '', d)} \
     dbus \
     fontconfig \
     glib \
@@ -84,6 +89,7 @@ PACKAGECONFIG_DEFAULT ?= "\
     zlib \
     zstd \
     ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwaylandscanner', '', d)} \
 "
 
 PACKAGECONFIG:remove:mingw32 = "openssl"
@@ -97,9 +103,6 @@ OPENSSL_LINKING_MODE ?= "runtime"
 QT_QPA_DEFAULT_PLATFORM ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', \
     bb.utils.contains('PACKAGECONFIG', 'gles2', 'eglfs', 'linuxfb', d), d)}"
 
-# at-spi bridge is used by XCB and wayland
-ACCESSIBILITY_DEPENDS = "${@bb.utils.contains_any("DISTRO_FEATURES", "x11 wayland", "at-spi2-core", "", d)}"
-
 PACKAGECONFIG[ltcg] = "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON,-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF"
 PACKAGECONFIG[optimize-size] = "-DFEATURE_optimize_size=ON,-DFEATURE_optimize_size=OFF"
 PACKAGECONFIG[static] = "-DBUILD_SHARED_LIBS=OFF,-DBUILD_SHARED_LIBS=ON"
@@ -123,17 +126,18 @@ PACKAGECONFIG[ctf] = "-DFEATURE_ctf=ON,-DFEATURE_ctf=OFF"
 
 # gui
 PACKAGECONFIG[gui] = "-DFEATURE_gui=ON,-DFEATURE_gui=OFF"
-PACKAGECONFIG[accessibility] = "-DFEATURE_accessibility=ON,-DFEATURE_accessibility=OFF,${ACCESSIBILITY_DEPENDS}"
+PACKAGECONFIG[accessibility] = "-DFEATURE_accessibility=ON,-DFEATURE_accessibility=OFF"
+PACKAGECONFIG[accessibility-atspi-bridge] = "-DFEATURE_accessibility_atspi_bridge=ON,-DFEATURE_accessibility_atspi_bridge=OFF,at-spi2-core"
 PACKAGECONFIG[directfb] = "-DFEATURE_directfb=ON,-DFEATURE_directfb=OFF,directfb"
 PACKAGECONFIG[fontconfig] = "-DFEATURE_fontconfig=ON,-DFEATURE_fontconfig=OFF,fontconfig"
 PACKAGECONFIG[gbm] = "-DFEATURE_gbm=ON,-DFEATURE_gbm=OFF,virtual/libgbm"
 PACKAGECONFIG[gl] = "-DFEATURE_opengl_desktop=ON,-DFEATURE_opengl_desktop=OFF,virtual/libgl"
 PACKAGECONFIG[gles2] = "-DFEATURE_opengles2=ON,-DFEATURE_opengles2=OFF,virtual/libgles2 virtual/egl"
-PACKAGECONFIG[eglfs] = "-DFEATURE_eglfs=ON,-DFEATURE_eglfs=OFF"
+PACKAGECONFIG[eglfs] = "-DFEATURE_eglfs=ON,-DFEATURE_eglfs=OFF,virtual/egl"
 PACKAGECONFIG[eglfs-egldevice] = "-DFEATURE_eglfs_egldevice=ON,-DFEATURE_eglfs_egldevice=OFF"
 PACKAGECONFIG[harfbuzz] = "-DFEATURE_harfbuzz=ON,-DFEATURE_harfbuzz=OFF,harfbuzz"
 PACKAGECONFIG[jpeg] = "-DFEATURE_jpeg=ON,-DFEATURE_jpeg=OFF,jpeg"
-PACKAGECONFIG[kms] = "-DFEATURE_kms=ON,-DFEATURE_kms=OFF,drm virtual/egl"
+PACKAGECONFIG[kms] = "-DFEATURE_kms=ON,-DFEATURE_kms=OFF,drm"
 PACKAGECONFIG[libinput] = "-DFEATURE_libinput=ON,-DFEATURE_libinput=OFF,libinput"
 PACKAGECONFIG[linuxfb] = "-DFEATURE_linuxfb=ON,-DFEATURE_linuxfb=OFF"
 PACKAGECONFIG[mtdev] = "-DFEATURE_mtdev=ON,-DFEATURE_mtdev=OFF,mtdev"
@@ -142,6 +146,7 @@ PACKAGECONFIG[png] = "-DFEATURE_system_png=ON,-DFEATURE_png=OFF,libpng"
 PACKAGECONFIG[tslib] = "-DFEATURE_tslib=ON,-DFEATURE_tslib=OFF,tslib"
 PACKAGECONFIG[vulkan] = "-DFEATURE_vulkan=ON,-DFEATURE_vulkan=OFF,vulkan-headers,vulkan-loader"
 PACKAGECONFIG[wayland] = "-DFEATURE_wayland=ON,-DFEATURE_wayland=OFF,wayland wayland-native"
+PACKAGECONFIG[qtwaylandscanner] = "-DFEATURE_qtwaylandscanner=ON,-DFEATURE_qtwaylandscanner=OFF,wayland wayland-native"
 PACKAGECONFIG[xcb] = "-DFEATURE_xcb=ON,-DFEATURE_xcb=OFF,libxcb xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-cursor"
 PACKAGECONFIG[xkbcommon] = "-DFEATURE_xkbcommon=ON,-DFEATURE_xkbcommon=OFF,libxkbcommon,xkeyboard-config"
 
@@ -249,6 +254,8 @@ isEmpty(QMAKE_CC): {
 EOF
 }
 
+FILES:${PN}-dev += "${datadir}/qt6/wayland"
+
 INSANE_SKIP:${PN}-ptest += "arch"
 INHIBIT_PACKAGE_STRIP_FILES = "\
     ${PKGD}${PTEST_PATH}/tests/auto/corelib/plugin/qpluginloader/elftest/corrupt2.elf64.so \

recipes-qt/qt6/qtgrpc/0001-Remove-the-export-of-QT_PROTO_INCLUDES-property.patch

@@ -1,30 +0,0 @@
-From 7e5ddd2e22c57fcd2eb7c8ae24150deb564a1b57 Mon Sep 17 00:00:00 2001
-From: Alexey Edelev <alexey.edelev@qt.io>
-Date: Wed, 16 Oct 2024 11:19:03 +0200
-Subject: [PATCH] Remove the export of QT_PROTO_INCLUDES property
-
-The export is not needed in recent version since the QT_PROTO_INCLUDES
-property is calculated according to the QtProtobufWellknownTypes
-install/staging/build prefixes.
-
-Pick-to: 6.8
-Fixes: QTBUG-130113
-Change-Id: I81ddc90334b4828ce5c73fe2ef0f12e3efe6b07c
-Upstream-Status: Submitted
----
- src/wellknown/Qt6ProtobufWellKnownTypesBuildInternals.cmake | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/wellknown/Qt6ProtobufWellKnownTypesBuildInternals.cmake b/src/wellknown/Qt6ProtobufWellKnownTypesBuildInternals.cmake
-index 50900553..49152702 100644
---- a/src/wellknown/Qt6ProtobufWellKnownTypesBuildInternals.cmake
-+++ b/src/wellknown/Qt6ProtobufWellKnownTypesBuildInternals.cmake
-@@ -121,8 +121,6 @@ function(qt_internal_add_protobuf_wellknown_types target)
-             EXPORT_NAME_PREFIX "${INSTALL_CMAKE_NAMESPACE}${target}"
-         )
-     endif()
--
--    set_property(TARGET ${target} APPEND PROPERTY EXPORT_PROPERTIES QT_PROTO_INCLUDES)
- endfunction()
- 
- # The function generates the header 'alias_file' containing the include of the original

recipes-qt/qt6/qtgrpc_git.bb

@@ -13,8 +13,6 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-SRC_URI += "file://0001-Remove-the-export-of-QT_PROTO_INCLUDES-property.patch"
-
 DEPENDS += "qtbase qtgrpc-native protobuf protobuf-native"
 
 PACKAGECONFIG ?= "qml"

recipes-qt/qt6/qtlanguageserver_git.bb

@@ -1,11 +1,10 @@
-LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only"
+LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & (LGPL-3.0-only | GPL-2.0-only) & GFDL-1.3-no-invariants-only"
 LIC_FILES_CHKSUM = " \
     file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
     file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
     file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
-    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
 "
 
 inherit qt6-cmake

recipes-qt/qt6/qtlottie_git.bb

@@ -10,5 +10,11 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
+DEPENDS += "\
+    qtbase \
+    qtdeclarative \
+    qtdeclarative-native \
+    qtlottie-native \
+"
 
+BBCLASSEXTEND = "native nativesdk"

recipes-qt/qt6/qtpositioning_git.bb

@@ -1,10 +1,9 @@
-LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GFDL-1.3-no-invariants-only) & BSD-3-Clause & BSL-1.0 & MIT"
+LICENSE = "(The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only) & BSD-3-Clause & BSL-1.0 & MIT"
 LIC_FILES_CHKSUM = " \
     file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
     file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
     file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
-    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
     file://src/3rdparty/clipper/LICENSE;md5=703fd70389dc10159a3da376b5480d52 \
     file://src/3rdparty/clip2tri/LICENSE;md5=20ada30cde771326c364b7987ff5585a \
     file://src/3rdparty/poly2tri/LICENSE;md5=ee547afd72a735d8f02ff92a09cfe403 \

recipes-qt/qt6/qtquick3d_git.bb

@@ -22,7 +22,7 @@ include recipes-qt/qt6/qt6.inc
 ASSIMP_BRANCH = "qt6_assimp"
 
 SRC_URI += " \
-    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qtquick3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
+    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qtquick3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/3rdparty/assimp/src \
     file://0001-Skip-embree-on-mingw.patch \
 "
 

recipes-qt/qt6/qttools_git.bb

@@ -18,8 +18,8 @@ include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
 SRC_URI += " \
-    ${QT_GIT}/playground/qlitehtml.git;name=qttools-qlitehtml;branch=master;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/assistant/qlitehtml \
-    git://github.com/litehtml/litehtml.git;name=qttools-qlitehtml-litehtml;branch=master;destsuffix=git/src/assistant/qlitehtml/src/3rdparty/litehtml;protocol=https \
+    ${QT_GIT}/playground/qlitehtml.git;name=qttools-qlitehtml;branch=master;protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/assistant/qlitehtml \
+    git://github.com/litehtml/litehtml.git;name=qttools-qlitehtml-litehtml;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/assistant/qlitehtml/src/3rdparty/litehtml;protocol=https \
     file://0002-examples-don-t-track-source-path.patch \
 "
 
@@ -33,7 +33,7 @@ QTTOOLS_USE_CLANG ?= "${@ 'clang' if bb.utils.to_boolean(d.getVar('CAN_USE_CLANG
 PACKAGECONFIG:class-native = "${QTTOOLS_USE_CLANG}"
 PACKAGECONFIG:class-nativesdk = "${QTTOOLS_USE_CLANG}"
 
-PACKAGECONFIG[clang] = "-DFEATURE_clang=ON,-DFEATURE_clang=OFF,clang"
+PACKAGECONFIG[clang] = ",-DFEATURE_clang=OFF,clang"
 
 FILES:${PN}-tools += "${QT6_INSTALL_DATADIR}/phrasebooks"
 

recipes-qt/qt6/qtvirtualkeyboard_git.bb

@@ -18,7 +18,7 @@ include recipes-qt/qt6/qt6.inc
 # and enable "t9write" in PACKAGECONFIG. This can be done in a separate .bbappend file.
 # for example:
 #T9WRITEPACKAGE = "${HOME}/Downloads/zzEval_QT_T9Write_Alpha_v750_20150916.zip"
-#SRC_URI += "file://${T9WRITEPACKAGE};subdir=git/src/virtualkeyboard/3rdparty/t9write"
+#SRC_URI += "file://${T9WRITEPACKAGE};subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/src/virtualkeyboard/3rdparty/t9write"
 #PACKAGECONFIG = "t9write"
 
 VKB_LANGUAGES ?= "\

recipes-qt/qt6/qtvncserver_git.bb

@@ -13,5 +13,5 @@ include recipes-qt/qt6/qt6-commercial.inc
 
 DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
 
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtwayland qtwayland-native"
+PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtwayland"
 PACKAGECONFIG[libtomcrypt] = ",,libtomcrypt"

recipes-qt/qt6/qtwayland/0001-Allow-qtwaylandscanner-to-be-built-without-dependenc.patch

@@ -1,41 +0,0 @@
-From 743bfbd8a9a11eb75234068c63e0b3f52e1a2823 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Wed, 29 Jan 2020 12:39:09 +0200
-Subject: [PATCH] Allow qtwaylandscanner to be built without dependencies
-
-Change-Id: I15aa5fc5128fcd0925d5950596bd56710b5b81d4
-Upstream-Status: Inappropriate [OE Specific]
----
- CMakeLists.txt     | 5 -----
- src/CMakeLists.txt | 2 +-
- 2 files changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c498e15b..21fadd02 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -18,11 +18,6 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
- )
- qt_internal_project_setup()
- 
--if(NOT MACOS AND NOT QNX AND (ANDROID OR NOT LINUX))
--    message(NOTICE "Skipping the build as the condition \"LINUX OR MACOS OR QNX\" is not met.")
--    return()
--endif()
--
- find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
-     Core
- )
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a38d9551..c4fe5fb1 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -20,7 +20,7 @@ endforeach()
- 
- qt_find_package(Wayland 1.15 PROVIDED_TARGETS ${wayland_libs})
- 
--if (NOT WaylandScanner_FOUND OR NOT Wayland_FOUND)
-+if ((QT_FEATURE_wayland_server OR QT_FEATURE_wayland_client) AND (NOT WaylandScanner_FOUND OR NOT Wayland_FOUND))
-     message(WARNING "QtWayland is missing required dependencies, nothing will be built. \
- Although this could be considered an error, the configuration will still pass as coin (Qt's \
- continuous integration system) will fail the build if configure fails, but will still try to \

recipes-qt/qt6/qtwayland_git.bb

@@ -1,4 +1,4 @@
-LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause) & HPND & MIT"
+LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause) & MIT"
 LIC_FILES_CHKSUM = " \
     file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
     file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
@@ -6,9 +6,8 @@ LIC_FILES_CHKSUM = " \
     file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
     file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/MIT.txt;md5=3605d54ecceddcd50962eb89318779ec \
     file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
-    file://src/3rdparty/protocol/text-input/v2/HPND_LICENSE.txt;md5=147672b78461c805e65dc29a92591db1 \
-    file://src/3rdparty/protocol/MIT_LICENSE.txt;md5=e8ad01a5182f2c1b3a2640e9ea268264 \
 "
 
 inherit qt6-cmake
@@ -19,21 +18,12 @@ REQUIRED_DISTRO_FEATURES = "wayland"
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-SRC_URI += "\
-    file://0001-Allow-qtwaylandscanner-to-be-built-without-dependenc.patch \
+DEPENDS += "\
+    qtbase \
+    qtdeclarative \
+    qtdeclarative-native \
+    wayland \
+    wayland-native \
 "
 
-PACKAGECONFIG ?= "\
-    wayland-client \
-    wayland-server \
-"
-PACKAGECONFIG:class-native ?= ""
-PACKAGECONFIG:class-nativesdk ?= ""
-
-PACKAGECONFIG[wayland-client] = "-DFEATURE_wayland_client=ON,-DFEATURE_wayland_client=OFF,"
-PACKAGECONFIG[wayland-server] = "-DFEATURE_wayland_server=ON,-DFEATURE_wayland_server=OFF,"
-
-DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
-
-BBCLASSEXTEND = "native nativesdk"
-
+INSANE_SKIP:${PN}-dev += "buildpaths"

recipes-qt/qt6/qtwebchannel_git.bb

@@ -19,3 +19,4 @@ PACKAGECONFIG ?= "qml"
 PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtwebsockets"
 PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
 
+INSANE_SKIP:${PN}-examples += "buildpaths"

recipes-qt/qt6/qtwebengine.inc

@@ -29,12 +29,12 @@ def gettext_oeconf(d):
     return ""
 
 QT_MODULE = "qtwebengine"
-QT_MODULE_BRANCH_CHROMIUM = "130-based"
+QT_MODULE_BRANCH_CHROMIUM = "134-based"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/qtwebengine:"
 
 SRC_URI += " \
-    ${QT_GIT}/${QT_GIT_PROJECT}/qtwebengine-chromium.git;name=qtwebengine-chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
+    ${QT_GIT}/${QT_GIT_PROJECT}/qtwebengine-chromium.git;name=qtwebengine-chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/3rdparty \
     file://0001-CMake-use-generated-yocto-toolchains.patch \
     file://0002-Enable-examples.patch \
 "

recipes-qt/qt6/qtwebengine/chromium/0001-v8-qemu-wrapper.patch

@@ -1,4 +1,4 @@
-From 03c0f7089ee4f54883073f9df23d379da35c9f35 Mon Sep 17 00:00:00 2001
+From f9ba9160e01ea1448b92d27101db37d0ee5317dd Mon Sep 17 00:00:00 2001
 From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
 Date: Tue, 7 Nov 2017 15:24:32 +0100
 Subject: [PATCH] v8: qemu wrapper
@@ -16,22 +16,22 @@ Signed-off-by: Maksim Sisov <msisov@igalia.com>
  2 files changed, 5 insertions(+)
 
 diff --git a/chromium/tools/v8_context_snapshot/BUILD.gn b/chromium/tools/v8_context_snapshot/BUILD.gn
-index 35c8c606a22..d3097e55e56 100644
+index ab4286508f4..5144e631f6a 100644
 --- a/chromium/tools/v8_context_snapshot/BUILD.gn
 +++ b/chromium/tools/v8_context_snapshot/BUILD.gn
-@@ -46,6 +46,7 @@ if (use_v8_context_snapshot) {
-       output_path = rebase_path(output_file, root_build_dir)
+@@ -50,6 +50,7 @@ if (use_v8_context_snapshot) {
+     output_path = rebase_path(output_file, root_build_dir)
  
-       args = [
-+        "../../../../v8-qemu-wrapper.sh",
-         "./" + rebase_path(get_label_info(":v8_context_snapshot_generator",
-                                           "root_out_dir") +
-                                "/v8_context_snapshot_generator",
+     args = [
++      "../../../../v8-qemu-wrapper.sh",
+       "./" + rebase_path(
+               get_label_info(
+                       ":v8_context_snapshot_generator($v8_snapshot_toolchain)",
 diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn
-index dcc3acbf8b3..c1fc540971a 100644
+index 2a367403ecd..b0c7df4ca42 100644
 --- a/chromium/v8/BUILD.gn
 +++ b/chromium/v8/BUILD.gn
-@@ -2240,6 +2240,7 @@ template("run_torque") {
+@@ -2181,6 +2181,7 @@ template("run_torque") {
      }
  
      args = [
@@ -39,7 +39,7 @@ index dcc3acbf8b3..c1fc540971a 100644
        "./" + rebase_path(
                get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
                root_build_dir),
-@@ -2403,6 +2404,7 @@ action("generate_bytecode_builtins_list") {
+@@ -2344,6 +2345,7 @@ action("generate_bytecode_builtins_list") {
    outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ]
    deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ]
    args = [
@@ -47,7 +47,7 @@ index dcc3acbf8b3..c1fc540971a 100644
      "./" + rebase_path(
              get_label_info(
                      ":bytecode_builtins_list_generator($v8_generator_toolchain)",
-@@ -2475,6 +2477,7 @@ template("run_mksnapshot") {
+@@ -2416,6 +2418,7 @@ template("run_mksnapshot") {
      }
  
      args += [
@@ -55,7 +55,7 @@ index dcc3acbf8b3..c1fc540971a 100644
        "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
                                          "root_out_dir") + "/mksnapshot",
                           root_build_dir),
-@@ -7515,6 +7518,7 @@ if (v8_enable_i18n_support) {
+@@ -7438,6 +7441,7 @@ if (v8_enable_i18n_support) {
      outputs = [ output_file ]
  
      args = [

recipes-qt/qt6/qtwebengine/chromium/0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch

@@ -1,4 +1,4 @@
-From 7eb6877c15ab9d73c9a7cf3a8a17a1a23f7396f9 Mon Sep 17 00:00:00 2001
+From c189f8c7ae843f08ba844f7cd3a3f4d2ca441a79 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 29 Apr 2019 12:00:19 +0300
 Subject: [PATCH] Remove the GN settings done for clang that conflict with OE
@@ -15,39 +15,39 @@ Upstream-Status: Inappropriate [OE-Specific]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Rebased-by: Maksim Sisov <msisov@igalia.com>
 Rebased-by: Randy MacLeod <randy.macleod@windriver.com>
-
 ---
- build/config/compiler/BUILD.gn | 38 ----------------------------------
- 1 file changed, 38 deletions(-)
+ chromium/build/config/compiler/BUILD.gn | 20 --------------------
+ 1 file changed, 20 deletions(-)
 
+diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn
+index b6a9cfb2058..72a559372c7 100644
 --- a/chromium/build/config/compiler/BUILD.gn
 +++ b/chromium/build/config/compiler/BUILD.gn
-@@ -1065,11 +1065,6 @@ config("compiler_cpu_abi") {
+@@ -1305,10 +1305,6 @@ config("compiler_cpu_abi") {
          ]
        }
      } else if (current_cpu == "arm") {
--      if (is_clang && !is_android && !is_nacl &&
--          !(is_chromeos_lacros && is_chromeos_device)) {
+-      if (is_clang && !is_android && !is_nacl && !is_chromeos_device) {
 -        cflags += [ "--target=arm-linux-gnueabihf" ]
 -        ldflags += [ "--target=arm-linux-gnueabihf" ]
 -      }
        if (!is_nacl) {
          cflags += ["-mfloat-abi=$arm_float_abi"]
          if (arm_arch != "") {
-@@ -1082,12 +1077,6 @@ config("compiler_cpu_abi") {
+@@ -1321,12 +1317,6 @@ config("compiler_cpu_abi") {
        if (arm_tune != "") {
          cflags += [ "-mtune=$arm_tune" ]
        }
 -    } else if (current_cpu == "arm64") {
 -      if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
--          !(is_chromeos_lacros && is_chromeos_device)) {
+-          !is_chromeos_device) {
 -        cflags += [ "--target=aarch64-linux-gnu" ]
 -        ldflags += [ "--target=aarch64-linux-gnu" ]
 -      }
      } else if (current_cpu == "mipsel" && !is_nacl) {
        ldflags += [ "-Wl,--hash-style=sysv" ]
        if (custom_toolchain == "") {
-@@ -1095,9 +1084,6 @@ config("compiler_cpu_abi") {
+@@ -1334,9 +1324,6 @@ config("compiler_cpu_abi") {
            if (is_android) {
              cflags += [ "--target=mipsel-linux-android" ]
              ldflags += [ "--target=mipsel-linux-android" ]
@@ -57,7 +57,7 @@ Rebased-by: Randy MacLeod <randy.macleod@windriver.com>
            }
          } else {
            cflags += [ "-EL" ]
-@@ -1177,8 +1163,6 @@ config("compiler_cpu_abi") {
+@@ -1416,8 +1403,6 @@ config("compiler_cpu_abi") {
        ldflags += [ "-Wl,--hash-style=sysv" ]
        if (custom_toolchain == "") {
          if (is_clang) {
@@ -66,7 +66,7 @@ Rebased-by: Randy MacLeod <randy.macleod@windriver.com>
          } else {
            cflags += [ "-EB" ]
            ldflags += [ "-EB" ]
-@@ -1226,9 +1210,6 @@ config("compiler_cpu_abi") {
+@@ -1465,9 +1450,6 @@ config("compiler_cpu_abi") {
            if (is_android) {
              cflags += [ "--target=mips64el-linux-android" ]
              ldflags += [ "--target=mips64el-linux-android" ]
@@ -76,7 +76,7 @@ Rebased-by: Randy MacLeod <randy.macleod@windriver.com>
            }
          } else {
            cflags += [
-@@ -1286,8 +1267,6 @@ config("compiler_cpu_abi") {
+@@ -1525,8 +1507,6 @@ config("compiler_cpu_abi") {
        ldflags += [ "-Wl,--hash-style=sysv" ]
        if (custom_toolchain == "") {
          if (is_clang) {

recipes-qt/qt6/qtwebview_git.bb

@@ -21,3 +21,6 @@ COMPATIBLE_MACHINE:armv6 = "(.*)"
 COMPATIBLE_MACHINE:armv7a = "(.*)"
 COMPATIBLE_MACHINE:armv7ve = "(.*)"
 COMPATIBLE_MACHINE:x86-64 = "(.*)"
+
+inherit features_check
+REQUIRED_DISTRO_FEATURES = "opengl"