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

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

README.md

@@ -20,17 +20,22 @@ Following table shows the Yocto branches 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.6 | 6.5 | 6.4 | 6.3 | 6.2 |
-| ---------- |:---:|:---:|:---:|:---:|:---:|:---:|
-| master     |  x  |  x  |  x  |     |     |     |
-| nanbield   |  x  |  x  |  x  |     |     |     |
-| mickledore |  x  |  x  |  x  |  x  |     |     |
-| langdale   |  c  |  c  |  c  |  x  |     |     |
-| kirkstone  |  x  |  x  |  x  |  x  |  x  |  x  |
-| honister   |     |  c  |  c  |  c  |  x  |  x  |
-| hardknott  |     |  c  |  c  |  c  |  c  |  c  |
-| gatesgarth |     |  c  |  c  |  c  |  c  |  c  |
-| dunfell    |     |  x  |  x  |  x  |  x  |  x  |
+| Yocto \ Qt | dev | 6.7  | 6.6  | 6.5 | 6.4 | 6.3 | 6.2 |
+|:---------- |:---:|:----:|:----:|:---:|:---:|:---:|:---:|
+| scarthgap  |  x  |  x   |  x   |  x  |     |     |     |
+| nanbield   |  x  |  x   |  x   |  x  |     |     |     |
+| mickledore |  c  |  c   |  c   |  c  |  c  |     |     |
+| langdale   |  c  |  c   |  c   |  c  |  c  |     |     |
+| kirkstone  |  x  |  x   |  x   |  x  |  c  |  c  |  x  |
+| honister   |     |      |  c   |  c  |  c  |  c  |  c  |
+| hardknott  |     |      |  c   |  c  |  c  |  c  |  c  |
+| gatesgarth |     |      |  c   |  c  |  c  |  c  |  c  |
+| dunfell    |     |      |  x   |  x  |  c  |  c  |  x  |
+|            |     |      |      |     |     |     |     |
+|            | dev |stable|stable| LTS | EOL | EOL | LTS |
+
+Detailed status of supported Qt versions can be found from
+https://doc.qt.io/qt-6/supported-platforms.html#supported-qt-versions
 
 Commercial Qt
 -------------

classes/srcrev-update.bbclass

@@ -2,7 +2,7 @@ python do_srcrev_update() {
     import subprocess
 
     recipe = d.getVar('FILE')
-    srcrev_file = os.path.join(os.path.dirname(recipe), 'qt6-git.inc')
+    srcrev_file = os.path.join(d.getVar('QT6BASE'), 'recipes-qt/qt6/qt6-git.inc')
 
     module = d.getVar('QT_MODULE')
 

coin/module_config.yaml

@@ -16,10 +16,10 @@ machine_type:
 # Target build matrix:
 #
 #           [target1]       [target2]   [target3]       [target4]       [target5]
-# [machine] qemuarm64       qemux86     qemuarm         qemux86-64      qemuarm64
-# [yocto]   nanbield        master      mickledore      master          kirkstone
-# [X11]     no              no          yes             yes             no
-# [mingw]   no              yes         no              no              no
+# [machine] qemuarm64       qemux86-64  qemuarm         qemux86         qemuarm64
+# [yocto]   master          master      master          nanbield        kirkstone
+# [wayland] yes             no          no              yes             yes
+# [mingw]   no              no          no              yes             no
 # [static]  no              no          no              no              yes
 #
 
@@ -31,7 +31,7 @@ target1: &target1
       variableValue: qemuarm64
     - type: EnvironmentVariable
       variableName: MANIFEST
-      variableValue: nanbield.xml
+      variableValue: master.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
       variableValue: ci configs wayland
@@ -44,13 +44,13 @@ target2: &target2
   instructions:
     - type: EnvironmentVariable
       variableName: MACHINE
-      variableValue: qemux86
+      variableValue: qemux86-64
     - type: EnvironmentVariable
       variableName: MANIFEST
       variableValue: master.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs wayland mingw no-webengine
+      variableValue: ci configs
   enable_if:
       condition: property
       property: target.arch
@@ -63,7 +63,7 @@ target3: &target3
       variableValue: qemuarm
     - type: EnvironmentVariable
       variableName: MANIFEST
-      variableValue: mickledore.xml
+      variableValue: master.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
       variableValue: ci configs
@@ -76,13 +76,13 @@ target4: &target4
   instructions:
     - type: EnvironmentVariable
       variableName: MACHINE
-      variableValue: qemux86-64
+      variableValue: qemux86
     - type: EnvironmentVariable
       variableName: MANIFEST
-      variableValue: master.xml
+      variableValue: nanbield.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs
+      variableValue: ci configs wayland mingw no-webengine
   enable_if:
       condition: property
       property: target.arch

coin/test-configs.inc

@@ -35,6 +35,8 @@ INSANE_SKIP:nativesdk-qemu-user-mips = "build-deps"
 PREFERRED_ARM_INSTRUCTION_SET              ?= "thumb"
 ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}"
 
+RDEPENDS:${PN}:append:pn-packagegroup-qt6-addons = " squish"
+
 # enable webengine with commercial/proprietary features
 DISTRO_FEATURES:append = " webengine"
 PACKAGECONFIG:append:pn-qtwebengine = " proprietary-codecs"

conf/layer.conf

@@ -35,12 +35,15 @@ LAYERVERSION_qt6-layer = "1"
 
 LAYERDEPENDS_qt6-layer = "core openembedded-layer meta-python"
 
-LAYERSERIES_COMPAT_qt6-layer = "kirkstone langdale mickledore nanbield"
+LAYERSERIES_COMPAT_qt6-layer = "kirkstone langdale mickledore nanbield scarthgap"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
 IMAGE_FEATURES[validitems] += "qtcreator-debug"
 
+# Set a variable to get to the top of the metadata location
+QT6BASE := "${LAYERDIR}"
+
 QT_GIT_PROJECT ?= "qt"
 QT_GIT ?= "git://code.qt.io"
 QT_GIT_PROTOCOL ?= "git"

licenses/Squish-Commercial-License-Agreement

@@ -0,0 +1,149 @@
+Squish Commercial License Agreement
+Agreement version 3.1
+
+This Squish Commercial License Agreement ("Agreement") is made by and
+between The Qt Company Oy ("The Qt Company"), and you (either an
+individual or a legal entity) ("Licensee").
+
+
+IMPORTANT - READ CAREFULLY:
+
+1. The Qt Company developed and originated Squish including source code,
+documentation and example programs ("Licensed Software"). The Licensed
+Software is protected by copyright laws and international copyright
+treaties, as well as other intellectual property laws and
+treaties. The Qt Company retains all rights not expressly granted.
+
+2. By installing, copying, or otherwise using the Licensed Software,
+Licensee agrees to be bound by the terms of this Agreement. If
+Licensee does not agree to the terms of this Agreement, Licensee
+should not install, copy, or otherwise use the Licensed Software. In
+addition, by installing, copying, or otherwise using any updates or
+other components of the Licensed Software that Licensee receives
+separately as part of the Licensed Software ("Updates"), Licensee
+agrees to be bound by any additional license terms that accompany such
+Updates. If Licensee does not agree to the additional license terms
+that accompany such Updates, Licensee may not install, copy, or
+otherwise use such Updates.
+
+3. Upon Licensee's acceptance of the terms and conditions of this
+Agreement, The Qt Company grants Licensee the right to use the Licensed
+Software during the agreed validity period as set forth in the
+respective License Certificate ("License Term"), solely for Licensee's
+internal business purposes in the manner provided below.
+
+4a. If the license, as specified in the license certificate, is a
+Floating Tester Subscription or Floating Execution Subscription,
+Licensee may install the Licensed Software on an unlimited amount of
+computers. Concurrent use of the installed Licensed Software is
+limited to the number of floating seats purchased as specified in the
+license certificate and to persons employed or contracted by the
+Licensee. If the license is a Floating Execution License, Licensee may
+only use the installed Licensed Software for executing tests and
+processing test results, but not for developing, debugging and
+maintaining tests.
+
+4b. If the license, as specified in the license certificate, is a User
+Node-Locked Subscription, Licensee may install the Licensed Software
+for a single user on a single physical computer. Installation and
+usage in virtual machines or the use via remote access is prohibited.
+
+5. Licensee may modify the Licensed Software except for altering or
+removing any details of ownership, copyright, trademark or other
+property right connected with the Licensed Software.
+
+6. Licensee may not distribute the Licensed Software, modified or
+unmodified, separately or as part of any software package.
+
+7. Upon expiry of the initially agreed License Term, the respective
+License Terms shall be automatically extended to one or more
+extensions of previous License Term as agreed between the Parties
+("Renewal Term"), unless and until either Party notifies the other
+Party in writing, or any other method acceptable to The Qt Company, that it
+does not wish to continue the License Term, such notification to be
+provided to the other Party no less than thirty (30) days before
+expiry of the respective License Term. Unless otherwise agreed between
+the Parties, Renewal Term shall be of equal length with the initial
+License Term.
+
+Any such Renewal Term shall be subject to License Fees agreed between
+the Parties or, if no advance agreement exists, subject to The Qt Company
+standard pricing applicable at the commencement date of any such
+Renewal Term.
+
+Any price or other term specified for a Renewal Term shall be valid
+only for the specified time.
+
+
+WARRANTY DISCLAIMER
+
+8. The Licensed Software is licensed to Licensee "as is". To the
+maximum extent permitted by applicable law, The Qt Company on behalf of
+itself and its suppliers, disclaims all warranties and conditions,
+either expressed or implied, including, but not limited to, implied
+warranties of merchantability, fitness for a particular purpose, title
+and non-infringement with regard to the Licensed Software.
+
+
+LIMITATION OF LIABILITY
+
+9. If, The Qt Company's warranty disclaimer notwithstanding, The Qt Company is
+held liable to Licensee, whether in contract, tort or any other legal
+theory, based on the Licensed Software, The Qt Company's entire liability
+to Licensee and Licensee's exclusive remedy shall be, at The Qt Company's
+option, either (A) return of the price Licensee paid for the Licensed
+Software, or (B) repair or replacement of the Licensed Software,
+provided Licensee returns to The Qt Company all copies of the Licensed
+Software as originally delivered to Licensee. The Qt Company shall not
+under any circumstances be liable to Licensee based on failure of the
+Licensed Software if the failure resulted from accident, abuse or
+misapplication, nor shall The Qt Company under any circumstances be liable
+for special damages, punitive or exemplary damages, damages for loss
+of profits or interruption of business or for loss or corruption of
+data. Any award of damages from The Qt Company to Licensee shall not exceed
+the total amount Licensee has paid to The Qt Company in connection with
+this Agreement.
+
+
+SUPPORT AND UPDATES
+
+10. Licensee will be eligible to receive email based software support
+and access to Downloads and Updates to the Licensed Software for the
+License Term, in accordance with The Qt Company's then current policies and
+procedures, if any. Such policies and procedures may be changed from
+time to time.
+
+
+PRIVACY
+
+11. Licensee acknowledges and agrees that for the purpose of this
+agreement, The Qt Company may collect, use, transfer and disclose personal
+data pertaining to Users as well as any other employees and directors
+of the Licensee and its contractors relevant for carrying out the
+intent of this agreement. Such personal data may be collected from the
+Licensee or directly from the relevant individuals. The parties
+acknowledge that with regard to such personal data processed
+hereunder, The Qt Company shall be regarded as the Data Controller under
+the applicable data protection legislation. The Qt Company shall process
+any such personal data in accordance with its privacy policies and
+practices, which will comply with all applicable requirements of the
+General Data Protection Regulation (GDPR) and any national
+implementing laws and regulations.
+
+
+GENERAL PROVISIONS
+
+12. This Agreement may only be modified in writing signed by
+authorized representatives of Licensee and The Qt Company. In case of a
+conflict between this Agreement and the terms of any purchase order or
+other ordering document, this Agreement shall prevail. If any provision
+of this Agreement is found void or unenforceable, the remainder will
+remain valid and enforceable according to its terms. If any remedy
+provided is determined to have failed for its essential purpose, all
+limitations of liability and exclusions of damages set forth in this
+Agreement shall remain in effect.
+
+13. This Agreement shall be construed, interpreted and governed by the
+laws of Finland, the legal venue to be Helsinki District Court. The Qt
+Company reserves all rights not specifically granted in this
+Agreement.

recipes-multimedia/webp/libwebp_%.bbappend

@@ -0,0 +1 @@
+BBCLASSEXTEND = "native nativesdk"

recipes-python/pytest-qt/python3-pytest-qt_4.2.0.bb

@@ -3,7 +3,7 @@ HOMEPAGE = "http://github.com/pytest-dev/pytest-qt"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=be0db96616c6ec3cabe975402c4c687f"
 
-SRC_URI[sha256sum] = "dfc5240dec7eb43b76bcb5f9a87eecae6ef83592af49f3af5f1d5d093acaa93e"
+SRC_URI[sha256sum] = "00a17b586dd530b6d7a9399923a40489ca4a9a309719011175f55dc6b5dc8f41"
 
 inherit pypi setuptools3
 

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

@@ -1,6 +1,9 @@
 DESCRIPTION = "Qt6 development host packages"
 LICENSE = "MIT"
 
+# avoid warning with inherit_defer allarch
+PACKAGE_ARCH = ""
+
 inherit packagegroup nativesdk
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"

recipes-qt/packagegroups/packagegroup-qt6-addons.bb

@@ -16,6 +16,7 @@ RDEPENDS:${PN} += " \
     qtconnectivity \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdatavis3d', '', d)} \
     qtdeviceutilities \
+    qtdoc \
     qtgraphs \
     qtgrpc \
     qthttpserver \
@@ -47,13 +48,27 @@ RDEPENDS:${PN} += " \
     qtwebsockets \
 "
 
-ARCHITECTURE_LIMITED_MODULES = "\
+RDEPENDS:${PN}:append:aarch64 = "\
     qtquick3dphysics \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebview', '', d)} \
+    qtpdf \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+"
+RDEPENDS:${PN}:append:arm = " qtquick3dphysics"
+RDEPENDS:${PN}:append:armv6 = "\
+    qtpdf \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+"
+RDEPENDS:${PN}:append:armv7a = "\
+    qtpdf \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+"
+RDEPENDS:${PN}:append:armv7ve = "\
+    qtpdf \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+"
+RDEPENDS:${PN}:append:x86 = " qtquick3dphysics"
+RDEPENDS:${PN}:append:x86-64 = "\
+    qtquick3dphysics \
+    qtpdf \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
 "
-RDEPENDS:${PN}:append:aarch64 ="${ARCHITECTURE_LIMITED_MODULES}"
-RDEPENDS:${PN}:append:arm ="${ARCHITECTURE_LIMITED_MODULES}"
-RDEPENDS:${PN}:append:x86 ="${ARCHITECTURE_LIMITED_MODULES}"
-RDEPENDS:${PN}:append:x86-64 ="${ARCHITECTURE_LIMITED_MODULES}"

recipes-qt/qt6/gn-utils.inc

@@ -46,6 +46,10 @@ def gn_target_arch_name(d):
                  'GN_TARGET_ARCH_NAME variable could not be found.')
     return name
 
+def gn_host_pkg_config(d):
+    """Return absolute paths to pkg-config-native."""
+    return d.getVar("STAGING_BINDIR_NATIVE") + "/" + "pkg-config-native"
+
 def write_toolchain_file(d, file_path):
     """Creates a complete GN toolchain file in |file_path|."""
     import string
@@ -69,6 +73,7 @@ def write_toolchain_file(d, file_path):
         '    current_cpu = "${current_cpu}"\n'
         '    current_os = "linux"\n'
         '    is_clang = false\n'
+        '    host_pkg_config = "${host_pkg_config}"\n'
         '  }\n'
         '}\n'
     )
@@ -76,6 +81,7 @@ def write_toolchain_file(d, file_path):
     native_toolchain = {
         'toolchain_name': 'yocto_native',
         'current_cpu': gn_host_arch_name(d),
+        'host_pkg_config': gn_host_pkg_config(d),
         'cc': d.expand('${BUILD_CC}'),
         'cxx': d.expand('${BUILD_CXX}'),
         'ar': d.expand('${BUILD_AR}'),
@@ -89,6 +95,7 @@ def write_toolchain_file(d, file_path):
     target_toolchain = {
         'toolchain_name': 'yocto_target',
         'current_cpu': gn_target_arch_name(d),
+        'host_pkg_config': gn_host_pkg_config(d),
         'cc': d.expand('${CC}'),
         'cxx': d.expand('${CXX}'),
         'ar': d.expand('${AR}'),

recipes-qt/qt6/ptest/run-ptest

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if [ ! -e tst_list ]; then
+if [ ! -s tst_list ]; then
     echo PASS: no tests
     exit 0
 fi

recipes-qt/qt6/qt6-git.inc

@@ -1,8 +1,10 @@
 DESCRIPTION ?= "Qt is a cross-platform application development framework for desktop, embedded and mobile."
 HOMEPAGE ?= "https://www.qt.io"
 
+inherit srcrev-update
+
 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "dev"
+QT_MODULE_BRANCH ?= "6.7"
 QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
 QT_MODULE_REPO ?= "${QT_MODULE}.git"
 
@@ -16,54 +18,55 @@ PV = "${QT_VERSION}"
 
 SRCREV = "${SRCREV_${QT_MODULE}}"
 
-SRCREV_tqtc-qmlcompilerplus = "382122a581757f0616a0ac2a224f3ad95b943c95"
-SRCREV_tqtc-qtinsighttracker = "55ed12e94347aff3cb28c301d0deac940008f0f3"
-SRCREV_tqtc-qtvncserver = "34de731acb51091dd08e03a67da408ec650501e8"
-SRCREV_qt3d = "1c28196b0b2822a07b476626d5f290f63fa9270b"
+SRCREV_tqtc-qmlcompilerplus = "6c91930c7f3bce964a9b0aea23af2b62fc4a75b5"
+SRCREV_tqtc-qtinsighttracker = "b617375e5a2d9b3d3deada45df5169e4f07c00b4"
+SRCREV_tqtc-qtvncserver = "902973f596fb82dd5b647687c9f8dd9dffe57c7a"
+SRCREV_qt3d = "584e1f3a3fdd787b2ace87114f787f89c5718ea5"
 SRCREV_qt3d-assimp = "c60a259fd35f09b8896b2920d48c436145914aae"
-SRCREV_qt5compat = "f1197726d22d5fbbc51d4bab477e2ae18907ba5e"
-SRCREV_qtbase = "9590ed6ba6dfc565832acddb69c69a3c8bf5e2e6"
-SRCREV_qtapplicationmanager = "4aa09bba7ccfdb07a086626c532d3644005c41e6"
-SRCREV_qtcharts = "c32125eb05363d22390cf7f453a38e603a2caf04"
-SRCREV_qtcoap = "8090b09167899487ff0c3f624b2281209e198df8"
-SRCREV_qtconnectivity = "c350b37296d70c9b391d60fffd15f60b4c3dadd3"
-SRCREV_qtdatavis3d = "3b59f1f1760b0b40cc783d02836b90b2ea15f351"
-SRCREV_qtdeclarative = "f187c3e5c3261d4040e4c742e32d31025409063b"
-SRCREV_qtdeviceutilities = "1fc1fc11c89c4d69511f738d71f3eeb2ab334f05"
-SRCREV_qtgraphs = "77f631ee55855c88d7c2840537c6e23ea0208159"
-SRCREV_qtgrpc = "ecb2c5a2625ffa4fff746f706963fd3293fbef58"
-SRCREV_qthttpserver = "914f5fb0f4323063da4af8b46c46e8356685295d"
-SRCREV_qtimageformats = "06e53077c1ecfa974aa4f5fbd362d9b4411a3323"
-SRCREV_qtinterfaceframework = "e85b8a049a41c931b17f72d8874deb4e471fa39f"
-SRCREV_qtlanguageserver = "ef312b17e10b3c5e16de22dc14bee0d2cb9cb430"
-SRCREV_qtlocation = "c5b09e87c648c15c567fddfddab1ef70e9e7fd36"
-SRCREV_qtlottie = "33ff6efbcfac80a71663c5a3d8dcde03b1e165cb"
-SRCREV_qtmqtt = "848a9546bad968b1959b0ae6e90418168cd3e2c6"
-SRCREV_qtmultimedia = "d23ccf42903271b85b899759f9c04108251bfb02"
-SRCREV_qtnetworkauth = "0d47af0bb60b73757c2db162c1a7ebbaaaf730c1"
-SRCREV_qtopcua = "54486646437c400ef7e1a0c77fcdd322584f9bd2"
-SRCREV_qtpositioning = "3aace826cc908854b68745eeafcebf96fd288dfb"
-SRCREV_qtquick3d = "b3b34d455d2c84671c3ffeb74ef69473109bc491"
-SRCREV_qtquick3d-assimp = "c300c2c8e32cb9125d7caf0342b83d79e4925acd"
-SRCREV_qtquick3dphysics = "355689c70eb574f741c7812405d2c9f995a3dbc4"
-SRCREV_qtquickdesigner-components = "5736952b4b0c8aab4ae56b622ea9a53ae718b60a"
-SRCREV_qtquicktimeline = "a4daf52350dcd069b544b3c3bf0cdf6da8cd36bb"
-SRCREV_qtremoteobjects = "d65103b6fe16fc86b419e2fbd390aafa8342d121"
-SRCREV_qtscxml = "2bcb374d3f2b61c9b8127cfa6e0a1bb440dae66c"
-SRCREV_qtsensors = "6bff9ef97e8be2ce744d290221f2963a1243e58a"
-SRCREV_qtserialbus = "9c9ab8704ae1145952aa900db0154c215d8435ab"
-SRCREV_qtserialport = "988a221ff79ed3fdd65f6e069748750ed7f56b92"
-SRCREV_qtshadertools = "366228649e657a48d95cf0718d232477f2d6f4c0"
-SRCREV_qtspeech = "6c101a55a4d6cfe993239d15bfdff6a16ad6ccf6"
-SRCREV_qtsvg = "94964c067825075d9df6b1792a507a93d07315a3"
-SRCREV_qttools = "f3ab84ee973c6a3bd6395fe9f223421b074c3757"
-SRCREV_qttools-qlitehtml = "f05f78ef33225823d348ee18f2fa464e95024dd2"
-SRCREV_qttools-qlitehtml-litehtml = "43af58e8adad70c4f1a0a9235546a246754c1737"
-SRCREV_qttranslations = "e4d93e101e8918e7b2e7f06203abf33255b39bdd"
-SRCREV_qtvirtualkeyboard = "62bc7a85ce874a7bf44eb73100538c7be23cc3af"
-SRCREV_qtwayland = "c2a69f9e67d9f522fd213155a91dc11d25949e4c"
-SRCREV_qtwebchannel = "1824317ff80186572a246a7c876c0d430fbb045b"
-SRCREV_qtwebengine = "aa5bcabe57c361b3a1e5b01ca736da33070223db"
-SRCREV_qtwebengine-chromium = "2f542548accfb380f649c078b0f513aaa81e7e5f"
-SRCREV_qtwebsockets = "5d2b62bc65d93edb1fbc01bd305b5fa77e7d551a"
-SRCREV_qtwebview = "14d9db4fc6fbb6c56d27100be712fce64a3f8e6b"
+SRCREV_qt5compat = "de8c7e0b43b82a5823015d4c2e267b013d2d2ee6"
+SRCREV_qtbase = "98602c26fc97eb41e3dd7548194ca637420a31b9"
+SRCREV_qtapplicationmanager = "9d3e2e0600bea28a6fa6623114ead6f837295960"
+SRCREV_qtcharts = "f35de24c01a6e9c64276b657407653e893c3004c"
+SRCREV_qtcoap = "dcbe6c5277a0c255a4d8c178b6215bf82489a0ef"
+SRCREV_qtconnectivity = "d8812bdd39e3927e524b3b38aeb9445dd4eba3a9"
+SRCREV_qtdatavis3d = "d5a8908f2d119061f0d920742b1f92ca55c999ab"
+SRCREV_qtdeclarative = "e6d14fcdc95713f65367499629f93fb1f1e35ec9"
+SRCREV_qtdeviceutilities = "9a49bc7039d03db7f87490f08ecda1529bceb6cf"
+SRCREV_qtdoc = "12b560d627d9a801075e61e7ca028556ffd64305"
+SRCREV_qtgraphs = "bb5fd92e6163400228876a0995a71e635917c9d5"
+SRCREV_qtgrpc = "e3b70ec75f488c1121d92bec18312c377dfd3de7"
+SRCREV_qthttpserver = "5336cc98bca36c3243c6ef1fca3547925bfc0604"
+SRCREV_qtimageformats = "3eedabd5150383e4345e2786a25bbd185c531785"
+SRCREV_qtinterfaceframework = "d87c6f81a84f910c1edd1cdb93f70b736042e4d2"
+SRCREV_qtlanguageserver = "f4f5ca2eecb2c48ad3ae98f8506ce7c2aceb623b"
+SRCREV_qtlocation = "c9749a81ebf26cb94f83d5569c336a67a6ee81fc"
+SRCREV_qtlottie = "5a8235d0a0cba5e2ebeec189dcc7b43c48eaa567"
+SRCREV_qtmqtt = "3816ff0913ec76cf60c10782b3023c8a41d18844"
+SRCREV_qtmultimedia = "5d2bdf00927771b74c407f7ffa958eb37b1f5e89"
+SRCREV_qtnetworkauth = "33a58af35ded52c430b802e191a6faffb8e418c0"
+SRCREV_qtopcua = "87e8ad711f7b34443cd1dfca886ab70116159e9c"
+SRCREV_qtpositioning = "f473f4b6598d07283feef8541746b9698a79c82a"
+SRCREV_qtquick3d = "2f4d3edc8062bac19885a6aec394f335e6e1b5ab"
+SRCREV_qtquick3d-assimp = "e21b73ab492fefb0cab229da75e385ba0befbffc"
+SRCREV_qtquick3dphysics = "e4ee17465899cb5d7e4f1c7783f043bffc42fe36"
+SRCREV_qtquickdesigner-components = "8be09977abbdb638bf483ea417b36091b409c54f"
+SRCREV_qtquicktimeline = "fd74687a02ea08ed102b952a645594596a4f53ce"
+SRCREV_qtremoteobjects = "6d973e34b5704a2a7c8ebe3db29f95004a1facb1"
+SRCREV_qtscxml = "0942dca79e25794bcb0d81cf04fdf74b621c489c"
+SRCREV_qtsensors = "3d3ad478b65a26a503e9837784332b52cde9478a"
+SRCREV_qtserialbus = "2c1fec48f9a8c075d5bd920f02c58e87322a3952"
+SRCREV_qtserialport = "df94dfb4016063614b0daaddb744322280ae14c1"
+SRCREV_qtshadertools = "65b015f6a272c8f5eb08f1c39aa8065f7e2379ed"
+SRCREV_qtspeech = "d019c418c1ef0e8bcc20c94e9301ddeaf8affd39"
+SRCREV_qtsvg = "85eeb5aecff1ad3e16b8ce960a5bfafc05df4461"
+SRCREV_qttools = "67a4b353b2ce2e063a61e73619c10865a5655d90"
+SRCREV_qttools-qlitehtml = "9c7b5d073bf4713250648cf7ea35580f489f7fd7"
+SRCREV_qttools-qlitehtml-litehtml = "6ca1ab0419e770e6d35a1ef690238773a1dafcee"
+SRCREV_qttranslations = "d0383e66bbb7fc90f24827cf5a70f926f06503dd"
+SRCREV_qtvirtualkeyboard = "6a52fb1c23d2a6cbac8c8634be1386b0b166e33e"
+SRCREV_qtwayland = "b71592631fa653985bf6f0e3024244460a42e5a6"
+SRCREV_qtwebchannel = "d2f8de3fd4d4b4547bca19d415cfc211979bb5e6"
+SRCREV_qtwebengine = "1a3e3a233d91037215851ac2821397fc9a846e64"
+SRCREV_qtwebengine-chromium = "da62c2f7a445a04b0ad66502c94e6226cd7dea95"
+SRCREV_qtwebsockets = "45d5cdde4c187a499745b5bb5fc14a8cef149679"
+SRCREV_qtwebview = "7548ee6677e7e9c02f51edff8676c1c29e2d108f"

recipes-qt/qt6/qt6-ptest.inc

@@ -12,66 +12,86 @@ DEBUG_PREFIX_MAP += "\
 
 do_install_ptest_base[progress] = "${@d.getVarFlag('do_compile', 'progress')}"
 
+B_PTEST = "${WORKDIR}/build-ptest"
+
 fakeroot do_install_ptest() {
     cat >${WORKDIR}/toolchain-ptest.cmake <<EOF
 include(${WORKDIR}/toolchain.cmake)
 list(PREPEND CMAKE_FIND_ROOT_PATH ${D})
 EOF
 
-    if [ -n "${OE_QMAKE_QMAKE}" ]; then
-        # qmake project
-        B_PTEST=${B}
-        mkdir -p ${B_PTEST}/tests
-        cd ${B_PTEST}/tests
-        ${OE_QMAKE_QMAKE} -o Makefile ${S}/tests
-        oe_runmake
-    else
-        # cmake project
-        B_PTEST=${WORKDIR}/build-ptest
-        mkdir -p ${B_PTEST}
-        cd ${B_PTEST}
-        cmake \
-            ${OECMAKE_GENERATOR_ARGS} \
-            -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain-ptest.cmake \
-            -DPython3_EXECUTABLE=${PYTHON} \
-            ${EXTRA_OECMAKE} \
-            -DQT_BUILD_STANDALONE_TESTS=ON \
-            -DQT_ADDITIONAL_PACKAGES_PREFIX_PATH=${D}${QT6_INSTALL_LIBDIR}/cmake \
-            -DCMAKE_STAGING_PREFIX=${D}${prefix} \
-            -DCMAKE_SKIP_RPATH=ON \
-            -DQT_DISABLE_NO_DEFAULT_PATH_IN_QT_PACKAGES=ON \
-            ${S} \
-            -Wno-dev
-        ${CMAKE_VERBOSE} cmake --build ${B_PTEST} --target all
-    fi
+    mkdir -p ${B_PTEST}
+    cd ${B_PTEST}
+    cmake \
+        ${OECMAKE_GENERATOR_ARGS} \
+        -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain-ptest.cmake \
+        -DPython3_EXECUTABLE=${PYTHON} \
+        ${EXTRA_OECMAKE} \
+        -DQT_BUILD_STANDALONE_TESTS=ON \
+        -DQT_ADDITIONAL_PACKAGES_PREFIX_PATH=${D}${QT6_INSTALL_LIBDIR}/cmake \
+        -DCMAKE_STAGING_PREFIX=${D}${prefix} \
+        -DCMAKE_SKIP_RPATH=ON \
+        -DQT_DISABLE_NO_DEFAULT_PATH_IN_QT_PACKAGES=ON \
+        ${S} \
+        -Wno-dev
+    ${CMAKE_VERBOSE} cmake --build ${B_PTEST} --target all
 
-    # if any auto tests were build
-    if [ -e "${B_PTEST}/tests/auto" ]; then
-        install -d ${D}${PTEST_PATH}/tests
-        cp -r ${B_PTEST}/tests/auto ${D}${PTEST_PATH}/tests
+    for tests in auto baseline
+    do
+        if [ -e "${B_PTEST}/tests/$tests" ]; then
+            install -d ${D}${PTEST_PATH}/tests
+            cp -r ${B_PTEST}/tests/$tests ${D}${PTEST_PATH}/tests
 
-        # remove build files
-        find ${D}${PTEST_PATH}/tests \
-            \( -wholename "*/.*" -o -wholename "*autogen*" -o -iwholename "*cmake*" -o -name Makefile \) \
-            -delete
+            # remove build files
+            find ${D}${PTEST_PATH}/tests/$tests \
+                \( -wholename "*/.*" -o -wholename "*autogen*" -o -iwholename "*cmake*" -o -name Makefile \) \
+                -delete
 
-        for f in $(find ${D}${PTEST_PATH} -name tst_* -executable); do
-            test=${f##${D}${PTEST_PATH}/}
-            testdir=$(dirname ${test})
             # tests may depend on files from sources
-            if [ -e ${S}/${testdir} ]; then
-                cp -r ${S}/${testdir}/* ${D}${PTEST_PATH}/${testdir}
-            fi
-            echo ${test} >> ${D}${PTEST_PATH}/tst_list
-        done
-    fi
+            cp -r ${S}/tests/$tests ${D}${PTEST_PATH}/tests
+        fi
+    done
+}
+
+fakeroot python do_create_ptest_list() {
+    import json, os, subprocess
+
+    builddir = d.getVar('B_PTEST')
+    ptest_path = d.getVar('PTEST_PATH')
+    try:
+        command_output = subprocess.check_output(['ctest', '--show-only=json-v1'], cwd=builddir, text=True)
+    except subprocess.CalledProcessError as e:
+        bb.fatal('Could not get list of tests: {e.output}')
+
+    json_data = json.loads(command_output)
+    tests_data = json_data.get('tests', [])
+
+    output = d.getVar('D') + os.path.join(ptest_path, 'tst_list')
+    file = open(output, 'w')
+
+    for test in tests_data:
+        test_name = test.get('name')
+        working_directory = next((prop['value'] for prop in test.get('properties', []) if prop['name'] == 'WORKING_DIRECTORY'), None)
+
+        test_executable = os.path.normpath(os.path.join(working_directory,test_name))
+        if test_executable.startswith(builddir) and os.path.isfile(test_executable):
+           test_executable = test_executable.replace(builddir,ptest_path)
+           file.write(f'{test_executable}\n')
+
+    file.close()
+}
+
+addtask create_ptest_list after do_install_ptest_base before do_package
+python () {
+    if not(d.getVar('PTEST_ENABLED') == "1"):
+        bb.build.deltask('do_create_ptest_list', d)
 }
 
 INSANE_SKIP:${PN}-ptest += "file-rdeps"
 
 PACKAGESPLITFUNCS =+ "remove_ptest_debug"
 remove_ptest_debug() {
-    if [ -e ${PKGD}${QT6_INSTALL_LIBDIR}/${BPN}/ptest/tests/auto ]; then
-        find ${PKGD}${QT6_INSTALL_LIBDIR}/${BPN}/ptest/tests/auto -depth -type d -name .debug -exec rm -rf '{}' \;
+    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 '{}' \;
     fi
 }

recipes-qt/qt6/qt6.inc

@@ -1,5 +1,3 @@
-inherit srcrev-update
-
 include recipes-qt/qt6/qt6-ptest.inc
 
 PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,"

recipes-qt/qt6/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch

@@ -1,4 +1,4 @@
-From 1662965c5b1fd00fb61c3fc29833324999c0bfc2 Mon Sep 17 00:00:00 2001
+From 4064b8757cbb28588fdff2529ea203bf3eabc579 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <zecke@selfish.org>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
@@ -15,18 +15,17 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Change-Id: I41595c6ce7514e8f197d0a19a1308c9460037d1b
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-
 ---
  src/corelib/global/qlibraryinfo.cpp | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index 715bda488c..3e9314be86 100644
+index 92729b06f1..dac7857600 100644
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -92,7 +92,12 @@ static QSettings *findConfiguration()
-     if (QLibraryInfoPrivate::qtconfManualPath)
-         return new QSettings(*QLibraryInfoPrivate::qtconfManualPath, QSettings::IniFormat);
+@@ -101,7 +101,12 @@ static QSettings *findConfiguration()
+     if (qtconfManualPath)
+         return new QSettings(*qtconfManualPath, QSettings::IniFormat);
  
 -    QString qtconfig = QStringLiteral(":/qt/etc/qt.conf");
 +    QByteArray config = getenv("OE_QMAKE_QTCONF_PATH");

recipes-qt/qt6/qtbase_git.bb

@@ -51,6 +51,7 @@ PACKAGECONFIG ?= "\
 
 PACKAGECONFIG_GRAPHICS ?= "\
     ${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \
         bb.utils.contains('DISTRO_FEATURES', 'x11', 'gl', 'kms gbm gles2 eglfs', d), 'no-opengl linuxfb', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
@@ -133,9 +134,10 @@ 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"
 PACKAGECONFIG[no-opengl] = "-DINPUT_opengl=no"
-PACKAGECONFIG[png] = "-DFEATURE_png=ON,-DFEATURE_png=OFF,libpng"
+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[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"
 
@@ -166,6 +168,7 @@ EXTRA_OECMAKE:append:class-target = "\
     -DFEATURE_rpath=OFF \
     -DFEATURE_relocatable=OFF \
     -DQT_QPA_DEFAULT_PLATFORM=${QT_QPA_DEFAULT_PLATFORM} \
+    -DQT_NO_GENERATE_QMAKE_WRAPPER_FOR_TARGET=ON \
 "
 
 EXTRA_OECMAKE:append:mingw32 = "\

recipes-qt/qt6/qtdeviceutilities_git.bb

@@ -2,8 +2,8 @@ LICENSE = "GPL-3.0-only | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qt6-cmake
-include recipes-qt/qt6/qt6.inc
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6.inc
 
 DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtvirtualkeyboard"
 RDEPENDS:${PN} = "connman"

recipes-qt/qt6/qtdoc_git.bb

@@ -0,0 +1,40 @@
+LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GFDL-1.3-no-invariants-only & BSD-3-Clause) & Apache-2.0 & CC-BY-4.0 & CC-BY-SA-4.0"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/Apache-2.0.txt;md5=b4c615f64dff32f71eeed614d13dfd4c \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/CC-BY-4.0.txt;md5=ed88d31cea57b15030a1f58ceb04e0d5 \
+    file://LICENSES/CC-BY-SA-4.0.txt;md5=7130783469368ceb248a4f03e89ea4b8 \
+    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=caa060942f6b722bc4329d4195584c38 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
+"
+
+inherit qt6-cmake
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6.inc
+
+DEPENDS += "\
+    qtbase \
+    qtcharts \
+    qtdeclarative qtdeclarative-native \
+    qtgraphs \
+    qtlocation \
+    qtmultimedia \
+    qtpositioning \
+    qtquick3d qtquick3d-native \
+    qtsensors \
+    qtshadertools-native \
+    qtsvg \
+    qtwebsockets \
+"
+DEPENDS:append:aarch64 = " qtpdf qtquick3dphysics"
+DEPENDS:append:arm = " qtquick3dphysics"
+DEPENDS:append:armv6 = " qtpdf"
+DEPENDS:append:armv7a = " qtpdf"
+DEPENDS:append:armv7ve = " qtpdf"
+DEPENDS:append:x86 = " qtquick3dphysics"
+DEPENDS:append:x86-64 = " qtpdf qtquick3dphysics"
+
+PACKAGECONFIG ?= "examples"

recipes-qt/qt6/qtinterfaceframework_git.bb

@@ -28,3 +28,5 @@ PACKAGECONFIG[ifcodegen] = "-DFEATURE_ifcodegen=ON,-DFEATURE_ifcodegen=OFF,pytho
 PACKAGECONFIG[remoteobjects] = "-DFEATURE_remoteobjects=ON,-DFEATURE_remoteobjects=OFF,qtremoteobjects qtremoteobjects-native"
 
 BBCLASSEXTEND = "native nativesdk"
+
+PRIVATE_LIBS:${PN}-examples = "libInstrumentCluster.so"

recipes-qt/qt6/qttools_git.bb

@@ -24,6 +24,10 @@ SRC_URI += " \
 
 DEPENDS += "qtbase qtdeclarative qttools-native"
 
+PACKAGECONFIG:class-native = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'clang-layer', 'clang', '', d)}"
+PACKAGECONFIG:class-nativesdk = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'clang-layer', 'clang', '', d)}"
+PACKAGECONFIG:remove:mingw32 = "clang"
+
 PACKAGECONFIG[clang] = "-DFEATURE_clang=ON,-DFEATURE_clang=OFF,clang"
 
 FILES:${PN}-tools += "${QT6_INSTALL_DATADIR}/phrasebooks"

recipes-qt/qt6/qtwebengine.inc

@@ -23,7 +23,7 @@ def gettext_oeconf(d):
     return ""
 
 QT_MODULE = "qtwebengine"
-QT_MODULE_BRANCH_CHROMIUM = "112-based"
+QT_MODULE_BRANCH_CHROMIUM = "118-based"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/qtwebengine:"
 
@@ -35,5 +35,6 @@ SRC_URI += " \
 
 SRC_URI += " \
     file://chromium/0001-v8-qemu-wrapper.patch;patchdir=src/3rdparty \
+    file://chromium/0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch;patchdir=src/3rdparty \
 "
 SRCREV_FORMAT = "qtwebengine_qtwebengine-chromium"

recipes-qt/qt6/qtwebengine/0001-CMake-use-generated-yocto-toolchains.patch

@@ -1,4 +1,4 @@
-From e6aff8d72eda7d3ea782779a4e45cf43e42b800a Mon Sep 17 00:00:00 2001
+From efa68fdedbec60380946f69a6a2f985958148e83 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Wed, 18 Aug 2021 15:09:41 +0300
 Subject: [PATCH] CMake: use generated yocto toolchains
@@ -10,14 +10,13 @@ target binaries where needed.
 
 Upstream-Status: Inappropriate [embedded specific]
 Change-Id: I217c9122144f25bb2d28717e7248c2a51b149127
-
 ---
  cmake/Functions.cmake | 12 +++++-------
  src/CMakeLists.txt    |  2 +-
  2 files changed, 6 insertions(+), 8 deletions(-)
 
 diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
-index b90447ed3..a63145b28 100644
+index 3371e5ff5..ac889d3f7 100644
 --- a/cmake/Functions.cmake
 +++ b/cmake/Functions.cmake
 @@ -825,7 +825,7 @@ endfunction()
@@ -29,9 +28,9 @@ index b90447ed3..a63145b28 100644
              create_pkg_config_wrapper("${buildDir}/pkg-config-host_wrapper.sh" "${PKG_CONFIG_HOST_EXECUTABLE}")
              set(PKG_CONFIG_HOST_EXECUTABLE "${buildDir}/pkg-config-host_wrapper.sh")
          endif()
-@@ -1073,15 +1073,13 @@ macro(append_toolchain_setup)
-     endif()
-     if(LINUX)
+@@ -1097,14 +1097,12 @@ macro(append_toolchain_setup)
+     elseif(LINUX)
+         get_gn_arch(cpu ${TEST_architecture_arch})
          list(APPEND gnArgArg
 -            custom_toolchain="${buildDir}/target_toolchain:target"
 -            host_toolchain="${buildDir}/host_toolchain:host"
@@ -39,7 +38,6 @@ index b90447ed3..a63145b28 100644
 +            host_toolchain="//build/toolchain/yocto:yocto_native"
 +            v8_snapshot_toolchain="//build/toolchain/yocto:yocto_target"
          )
-         get_gn_arch(cpu ${TEST_architecture_arch})
          if(CMAKE_CROSSCOMPILING)
 -            list(APPEND gnArgArg
 -                v8_snapshot_toolchain="${buildDir}/v8_toolchain:v8"
@@ -50,10 +48,10 @@ index b90447ed3..a63145b28 100644
              list(APPEND gnArgArg host_cpu="${cpu}")
          endif()
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 59eb27e73..b9c8f2b7f 100644
+index 0084697f2..1c9059ae6 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -157,7 +157,7 @@ endif()
+@@ -161,7 +161,7 @@ endif()
  #  HOST PROJECT
  ##
  

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

@@ -0,0 +1,87 @@
+From 7eb6877c15ab9d73c9a7cf3a8a17a1a23f7396f9 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
+
+clang cross compiler that is build with meta-clang has lot of these
+settings built-in and specifying them here confuses the compiler
+
+--target option and -no-canonical-prefixes options result in clang
+
+finding the headers in target sysroot
+
+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(-)
+
+--- a/chromium/build/config/compiler/BUILD.gn
++++ b/chromium/build/config/compiler/BUILD.gn
+@@ -1065,11 +1065,6 @@ config("compiler_cpu_abi") {
+         ]
+       }
+     } else if (current_cpu == "arm") {
+-      if (is_clang && !is_android && !is_nacl &&
+-          !(is_chromeos_lacros && 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") {
+       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)) {
+-        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") {
+           if (is_android) {
+             cflags += [ "--target=mipsel-linux-android" ]
+             ldflags += [ "--target=mipsel-linux-android" ]
+-          } else {
+-            cflags += [ "--target=mipsel-linux-gnu" ]
+-            ldflags += [ "--target=mipsel-linux-gnu" ]
+           }
+         } else {
+           cflags += [ "-EL" ]
+@@ -1177,8 +1163,6 @@ config("compiler_cpu_abi") {
+       ldflags += [ "-Wl,--hash-style=sysv" ]
+       if (custom_toolchain == "") {
+         if (is_clang) {
+-          cflags += [ "--target=mips-linux-gnu" ]
+-          ldflags += [ "--target=mips-linux-gnu" ]
+         } else {
+           cflags += [ "-EB" ]
+           ldflags += [ "-EB" ]
+@@ -1226,9 +1210,6 @@ config("compiler_cpu_abi") {
+           if (is_android) {
+             cflags += [ "--target=mips64el-linux-android" ]
+             ldflags += [ "--target=mips64el-linux-android" ]
+-          } else {
+-            cflags += [ "--target=mips64el-linux-gnuabi64" ]
+-            ldflags += [ "--target=mips64el-linux-gnuabi64" ]
+           }
+         } else {
+           cflags += [
+@@ -1286,8 +1267,6 @@ config("compiler_cpu_abi") {
+       ldflags += [ "-Wl,--hash-style=sysv" ]
+       if (custom_toolchain == "") {
+         if (is_clang) {
+-          cflags += [ "--target=mips64-linux-gnuabi64" ]
+-          ldflags += [ "--target=mips64-linux-gnuabi64" ]
+         } else {
+           cflags += [
+             "-EB",

recipes-qt/qt6/qtwebengine_git.bb

@@ -2,6 +2,7 @@ require recipes-qt/qt6/qtwebengine.inc
 require recipes-qt/qt6/chromium-gn.inc
 
 DEPENDS += " \
+    fontconfig-native \
     nodejs-native \
     gperf-native \
     bison-native \
@@ -52,11 +53,11 @@ PACKAGECONFIG[glib] = "-DFEATURE_webengine_system_glib=ON,-DFEATURE_webengine_sy
 PACKAGECONFIG[harfbuzz] = "-DFEATURE_webengine_system_harfbuzz=ON,-DFEATURE_webengine_system_harfbuzz=OFF,harfbuzz"
 PACKAGECONFIG[icu] = "-DFEATURE_webengine_system_icu=ON,-DFEATURE_webengine_system_icu=OFF,icu"
 PACKAGECONFIG[lcms2] = "-DFEATURE_webengine_system_lcms2=ON,-DFEATURE_webengine_system_lcms2=OFF,lcms"
-PACKAGECONFIG[libevent] = "-DFEATURE_webengine_system_libevent=ON,-DFEATURE_webengine_system_libevent=OFF,libevent"
+PACKAGECONFIG[libevent] = "-DFEATURE_webengine_system_libevent=ON,-DFEATURE_webengine_system_libevent=OFF,libevent libevent-native"
 PACKAGECONFIG[libjpeg] = "-DFEATURE_webengine_system_libjpeg=ON,-DFEATURE_webengine_system_libjpeg=OFF,jpeg"
 PACKAGECONFIG[libpng] = "-DFEATURE_webengine_system_libpng=ON,-DFEATURE_webengine_system_libpng=OFF,libpng"
 PACKAGECONFIG[libvpx] = "-DFEATURE_webengine_system_libvpx=ON,-DFEATURE_webengine_system_libvpx=OFF,libvpx"
-PACKAGECONFIG[libwebp] = "-DFEATURE_webengine_system_libwebp=ON,-DFEATURE_webengine_system_libwebp=OFF,libwebp"
+PACKAGECONFIG[libwebp] = "-DFEATURE_webengine_system_libwebp=ON,-DFEATURE_webengine_system_libwebp=OFF,libwebp libwebp-native"
 PACKAGECONFIG[libxml] = "-DFEATURE_webengine_system_libxml=ON,-DFEATURE_webengine_system_libxml=OFF,libxml2 libxslt"
 PACKAGECONFIG[opus] = "-DFEATURE_webengine_system_opus=ON,-DFEATURE_webengine_system_opus=OFF,libopus"
 PACKAGECONFIG[libpci] = "-DFEATURE_webengine_system_libpci=ON,-DFEATURE_webengine_system_libpci=OFF,pciutils"

recipes-qt/squish/squish_7.2-20240124-0915.bb

@@ -0,0 +1,87 @@
+LICENSE = "Squish-Commercial-License-Agreement"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=26ea9708fd32ef443b69239b5d9b343c"
+
+EXCLUDE_FROM_WORLD = "1"
+
+inherit qt6-qmake
+
+SQUISH_MIRROR ?= "https://ci-files01-hki.ci.qt.io/input/squish/coin/66x/20240124"
+
+SRC_URI = "\
+    ${SQUISH_MIRROR}/squish-${PV}-qt66x-linux64.run;name=squish \
+    ${SQUISH_MIRROR}/squish-${PV}-qt-embedded-src.tar.gz;name=qt-squish-embedded \
+"
+
+SRC_URI[squish.sha256sum] = "69689f25cecf07ce15f8e8975f9cf44d85cc1d0f628d3013dfb6dfc9f562aa91"
+SRC_URI[qt-squish-embedded.sha256sum] = "8f0c03f3814eb44f2366f0599e7f6ef52446651fc1882bd487918e441ceac07a"
+
+S = "${WORKDIR}/squish-${PV}-qt-embedded-src"
+B = "${WORKDIR}/build"
+
+DEPENDS += "\
+    qtbase \
+    qt5compat \
+    qtdeclarative qtdeclarative-native \
+    qtapplicationmanager \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland qtwayland-native wayland wayland-native', '', d)} \
+"
+
+lcl_maybe_fortify = ""
+OE_QMAKE_PATH_HOST_LIBEXECS = "${STAGING_DIR_NATIVE}/${QT6_INSTALL_LIBEXECDIR}"
+
+do_install_squish[cleandirs] = "${WORKDIR}/squish"
+do_install_squish[network] = "1"
+do_install_squish() {
+    chmod +x ${WORKDIR}/squish-${PV}-qt66x-linux64.run
+    TMPDIR=${WORKDIR}/tmp XDG_RUNTIME_DIR=${WORKDIR}/tmp ${WORKDIR}/squish-${PV}-qt66x-linux64.run \
+        -platform minimal unattended=1 targetdir=${WORKDIR}/squish ide=0 testcenter=0
+}
+
+do_configure() {
+    ${S}/configure \
+        --disable-all \
+        --enable-qmake-config \
+        --enable-qt \
+        --enable-server \
+        --enable-wayland \
+        --with-qmake=${STAGING_DIR_NATIVE}${QT6_INSTALL_BINDIR}/qmake \
+        --with-squishidl=${WORKDIR}/squish/bin/squishidl
+}
+
+do_compile() {
+    ./build -j${@oe.utils.cpu_count()}
+}
+
+do_install() {
+    DESTDIR=${D}/opt/squish
+    ./build install DESTDIR=${DESTDIR}
+
+    install -d ${D}${QT6_INSTALL_PLUGINSDIR}
+    mv ${DESTDIR}/plugins/* ${D}${QT6_INSTALL_PLUGINSDIR}
+    rmdir ${DESTDIR}/plugins
+
+    sed -i -e 's|${RECIPE_SYSROOT}||' ${D}/opt/squish/etc/paths.ini
+
+    install -d ${D}${sysconfdir}/profile.d
+    echo "export SQUISH_PREFIX=/opt/squish" > ${D}${sysconfdir}/profile.d/squish.sh
+}
+
+FILES:${PN} += "\
+    ${QT6_INSTALL_PLUGINSDIR} \
+    /opt/squish \
+"
+FILES:${PN}-dev += "\
+    /opt/squish/qtbuiltinhook.pri \
+    /opt/squish/LICENSE \
+    /opt/squish/include \
+    /opt/squish/lib/cmake \
+    /opt/squish/sdk \
+"
+FILES:${PN}-dev:remove = "${FILES_SOLIBSDEV}"
+FILES:${PN}-staticdev += "\
+    ${QT6_INSTALL_PLUGINSDIR}/generic/*.a \
+    /opt/squish/lib/*.a \
+    /opt/squish/lib/extensions/qt/*.a \
+"
+
+addtask install_squish after do_unpack before do_configure