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

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

README.md

@@ -20,21 +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.8  | 6.7  | 6.6 | 6.5 | 6.4 | 6.3 | 6.2 |
-|:---------- |:---:|:----:|:----:|:---:|:---:|:---:|:---:|:---:|
-| walnascar  |  x  |  x   |      |     |     |     |     |     |
-| styhead    |  x  |  x   |  x   |     |     |     |     |     |
-| scarthgap  |  x  |  x   |  x   |  c  |  x  |     |     |     |
-| nanbield   |  c  |  c   |  x   |  c  |  c  |     |     |     |
-| mickledore |  c  |  c   |  c   |  c  |  c  |  c  |     |     |
-| langdale   |  c  |  c   |  c   |  c  |  c  |  c  |     |     |
-| kirkstone  |  x  |  x   |  x   |  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|stable| EOL | LTS | EOL | EOL | EOL |
+| Yocto \ Qt | 6.9  | 6.8 | 6.7 | 6.6 | 6.5 | 6.4 | 6.3 | 6.2 |
+|:---------- |:----:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
+| whinlatter |  x   |  x  |     |     |     |     |     |     |
+| walnascar  |  x   |  x  |     |     |     |     |     |     |
+| styhead    |  x   |  x  |  c  |     |     |     |     |     |
+| scarthgap  |  x   |  x  |  c  |  c  |  x  |     |     |     |
+| nanbield   |  c   |  c  |  c  |  c  |  c  |     |     |     |
+| mickledore |  c   |  c  |  c  |  c  |  c  |  c  |     |     |
+| langdale   |  c   |  c  |  c  |  c  |  c  |  c  |     |     |
+| kirkstone  |  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| 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

SECURITY.md

@@ -0,0 +1,26 @@
+Qt Project Security Policy
+==========================
+
+The Qt Project specifies its security policy in [QUIP 15](https://contribute.qt-project.org/quips/15). A summary of the security policy:
+
+* Qt has a Core Security Team that enforces the security policy and addresses issues.
+* Proactive measures to prevent security issues - code reviews, code analysis, fuzz testing, and so on.
+* Reporting Security Issues: the Core Security Team monitors security issues for Qt modules and affected third-party components.
+* Handling Security Issues: the maintainers, Core Security Team, Chief Maintainer, and the Qt Company share and handle security issues.
+* Disclosure of confirmed security issues at Common Vulnerabilities and Exposures database and a public announcement to the Qt announce@qt-project.org mailing list.
+
+Reporting Security Issues
+-------------------------
+
+To report security issues in Qt Products, send an email to Security Mail List at security@qt-project.org.
+The Core Security Team monitors and moderates incoming emails on business days (excluding weekends).
+After sending an email to the Security Mail List, there will be an acknowledgment of receipt within
+two business days. If there is no response, then the reporter should contact the Chief Maintainer directly.
+
+What Versions of Qt are Covered by this Policy?
+-----------------------------------------------
+
+While we are interested in reports against any Qt version that is still maintained, fixes are only guaranteed to be provided for:
+
+* The latest released version.
+* The preceding minor version.

classes/populate_sdk_qt6_base.bbclass

@@ -27,7 +27,7 @@ create_qt6_sdk_files () {
     echo 'Binaries = ${QT6_INSTALL_BINDIR}' >> $qtconf
     echo 'LibraryExecutables = ${QT6_INSTALL_LIBEXECDIR}' >> $qtconf
     echo 'Plugins = ${QT6_INSTALL_PLUGINSDIR}' >> $qtconf
-    echo 'Qml2Imports = ${QT6_INSTALL_QMLDIR}' >> $qtconf
+    echo 'QmlImports = ${QT6_INSTALL_QMLDIR}' >> $qtconf
     echo 'Translations = ${QT6_INSTALL_TRANSLATIONSDIR}' >> $qtconf
     echo 'Documentation = ${QT6_INSTALL_DOCDIR}' >> $qtconf
     echo 'Settings = ${QT6_INSTALL_SYSCONFDIR}' >> $qtconf

classes/qt6-cmake.bbclass

@@ -9,9 +9,11 @@ EXTRA_OECMAKE += "\
     -DCMAKE_MESSAGE_LOG_LEVEL=${QT_MESSAGE_LOG_LEVEL} \
 "
 QT_FORCE_BUILD_TOOLS ?= "OFF"
+QT_INSTALL_EXAMPLES_SOURCES ?= "OFF"
 EXTRA_OECMAKE:append:class-target = "\
     -DQT_HOST_PATH:PATH=${RECIPE_SYSROOT_NATIVE}${prefix_native}/ \
     -DQT_FORCE_BUILD_TOOLS=${QT_FORCE_BUILD_TOOLS} \
+    -DQT_INSTALL_EXAMPLES_SOURCES=${QT_INSTALL_EXAMPLES_SOURCES} \
     -D__harfbuzz_broken_config_file=TRUE \
 "
 EXTRA_OECMAKE:append:class-nativesdk = "\

classes/qt6-paths.bbclass

@@ -27,7 +27,7 @@ QT6_INSTALL_SYSCONFDIR ?= "${sysconfdir}/xdg"
 QT6_INSTALL_EXAMPLESDIR ?= "${datadir}/examples"
 # Tests [PREFIX/tests]
 QT6_INSTALL_TESTSDIR ?= "${prefix}/tests"
-# Module description files directory [DATADIR/modules]
-QT6_INSTALL_DESCRIPTIONSDIR ?= "${datadir}/modules"
+# Module description files directory [ARCHDATADIR/modules]
+QT6_INSTALL_DESCRIPTIONSDIR ?= "${libdir}/modules"
 # Mkspecs files [PREFIX/mkspecs]
 QT6_INSTALL_MKSPECSDIR ?= "${libdir}/mkspecs"

classes/qt6-qmake.bbclass

@@ -92,7 +92,7 @@ Data = ${OE_QMAKE_PATH_DATA}
 Binaries = ${OE_QMAKE_PATH_BINS}
 LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}
 Plugins = ${OE_QMAKE_PATH_PLUGINS}
-Qml2Imports = ${OE_QMAKE_PATH_QML}
+QmlImports = ${OE_QMAKE_PATH_QML}
 Translations = ${OE_QMAKE_PATH_TRANSLATIONS}
 Documentation = ${OE_QMAKE_PATH_DOCS}
 Settings = ${OE_QMAKE_PATH_SETTINGS}
@@ -124,7 +124,7 @@ Data = ${OE_QMAKE_PATH_DATA}
 Binaries = ${OE_QMAKE_PATH_BINS}
 LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}
 Plugins = ${OE_QMAKE_PATH_PLUGINS}
-Qml2Imports = ${OE_QMAKE_PATH_QML}
+QmlImports = ${OE_QMAKE_PATH_QML}
 Translations = ${OE_QMAKE_PATH_TRANSLATIONS}
 Documentation = ${OE_QMAKE_PATH_DOCS}
 Settings = ${OE_QMAKE_PATH_SETTINGS}
@@ -162,7 +162,7 @@ EOF
 # Binaries The location of installed Qt binaries (tools and applications).
 # Plugins The location of installed Qt plugins.
 # Imports The location of installed QML extensions to import (QML 1.x).
-# Qml2Imports The location of installed QML extensions to import (QML 2.x).
+# QmlImports The location of installed QML extensions to import (QML 2.x).
 # ArchData The location of general architecture-dependent Qt data.
 # Data The location of general architecture-independent Qt data.
 # Translations The location of translation information for Qt strings.

classes/srcrev-update.bbclass

@@ -20,18 +20,21 @@ python do_srcrev_update() {
     d.setVar("__BBSRCREV_SEEN", "1")
     for scm in scms:
         ud = urldata[scm]
-        for name in ud.names:
-            rev = ud.method.latest_revision(ud, d, name)
-            srcrev = d.getVar("SRCREV_%s" % name)
-            if srcrev is None: srcrev = d.getVar("SRCREV")
+        if hasattr(ud, 'names'):
+            name = ud.names[0]
+        else:
+            name = ud.name
+        rev = ud.method.latest_revision(ud, d, name)
+        srcrev = d.getVar("SRCREV_%s" % name)
+        if srcrev is None: srcrev = d.getVar("SRCREV")
 
-            if srcrev == rev:
-                bb.plain("%s: %s is already latest" % (name, srcrev))
-                continue
+        if srcrev == rev:
+            bb.plain("%s: %s is already latest" % (name, srcrev))
+            continue
 
-            bb.plain("%s: %s -> %s" % (name, srcrev, rev))
-            cmd = "sed -E -i %s %s -e '/SRCREV(_%s)? /s/%s/%s/'" %  (recipe, srcrev_file, name, srcrev, rev)
-            bb.process.run(cmd, log=None, shell=True, stderr=subprocess.PIPE, cwd=None)
+        bb.plain("%s: %s -> %s" % (name, srcrev, rev))
+        cmd = "sed -E -i %s %s -e '/SRCREV(_%s)? /s/%s/%s/'" %  (recipe, srcrev_file, name, srcrev, rev)
+        bb.process.run(cmd, log=None, shell=True, stderr=subprocess.PIPE, cwd=None)
 }
 do_srcrev_update[nostamp] = "1"
 addtask srcrev_update after do_fetch

coin/module_config.yaml

@@ -17,7 +17,7 @@ machine_type:
 #
 #           [target1]       [target2]   [target3]       [target4]       [target5]
 # [machine] qemuarm64       qemux86-64  qemuarm         qemux86         qemuarm64
-# [yocto]   master          master      scarthgap       styhead         kirkstone
+# [yocto]   master          walnascar   scarthgap       styhead         kirkstone
 # [wayland] yes             no          no              yes             yes
 # [mingw]   no              no          yes             no              no
 # [static]  no              no          no              no              yes
@@ -34,7 +34,7 @@ target1: &target1
       variableValue: master.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs wayland
+      variableValue: ci configs wayland python
   enable_if:
       condition: property
       property: target.arch
@@ -47,10 +47,10 @@ target2: &target2
       variableValue: qemux86-64
     - type: EnvironmentVariable
       variableName: MANIFEST
-      variableValue: master.xml
+      variableValue: walnascar.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs
+      variableValue: ci configs python
   enable_if:
       condition: property
       property: target.arch
@@ -66,7 +66,7 @@ target3: &target3
       variableValue: scarthgap.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs mingw
+      variableValue: ci configs mingw python
   enable_if:
       condition: property
       property: target.arch
@@ -82,7 +82,7 @@ target4: &target4
       variableValue: styhead.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs wayland no-webengine
+      variableValue: ci configs wayland no-webengine python
   enable_if:
       condition: property
       property: target.arch
@@ -98,7 +98,7 @@ target5: &target5
       variableValue: kirkstone.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs wayland static no-webengine
+      variableValue: ci configs wayland static no-webengine python
   enable_if:
       condition: property
       property: target.arch
@@ -137,7 +137,7 @@ instructions:
       chmod +x repo
 
       ./repo init \
-          --repo-url https://github.com/theqtcompany/git-repo \
+          --repo-url git@git.qt.io:boot2qt/git-repo.git \
           -u git://code.qt.io/yocto/boot2qt-manifest \
           -b ci \
           -m ${MANIFEST} \
@@ -149,6 +149,9 @@ instructions:
       bitbake-layers add-layer ../meta-openembedded/meta-python
       bitbake-layers add-layer ../meta-openembedded/meta-multimedia
       bitbake-layers add-layer ../meta-mingw
+      if [ -e ../meta-clang ]; then
+        bitbake-layers add-layer ../meta-clang
+      fi
       bitbake-layers add-layer ${SOURCE_DIR}
 
       for conf in ${TEST_CONFIGS}; do

coin/test-configs.inc

@@ -39,6 +39,11 @@ INSANE_SKIP:append:pn-nativesdk-clang = " buildpaths"
 PREFERRED_ARM_INSTRUCTION_SET              ?= "thumb"
 ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}"
 
+# build squish
+USE_SQUISH = "1"
+SQUISH_MIRROR = "https://ci-files01-hki.ci.qt.io/input/squish/releasepackages"
+SQUISH_LICENSE_KEY = "qt-srv-19.intra.qt.io:49345"
+
 # enable webengine with commercial/proprietary features
 DISTRO_FEATURES:append = " webengine"
 PACKAGECONFIG:append:pn-qtwebengine = " proprietary-codecs"
@@ -47,7 +52,6 @@ PACKAGECONFIG:append:pn-qtbase = "\
     tslib kms gbm zstd libproxy gssapi vulkan mtdev cups \
     sql-mysql sql-odbc sql-psql sql-sqlite journald brotli \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
-    use-gold-linker \
 "
 
 # imageformats mng FIXME

coin/test-python.inc

@@ -0,0 +1,2 @@
+RDEPENDS:${PN}:append:pn-packagegroup-qt6-addons = " python3-pyside6"
+

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}"
 
@@ -48,12 +46,15 @@ QT_GIT_PROJECT ?= "qt"
 QT_GIT ?= "git://code.qt.io"
 QT_GIT_PROTOCOL ?= "git"
 QT_EDITION ?= "opensource"
-QT_VERSION = "6.9.0"
+QT_VERSION = "6.9.3"
 
 QT_COMMERCIAL_GIT ?= "git://codereview.qt-project.org"
 QT_COMMERCIAL_GIT_PROTOCOL ?= "ssh"
 
 QT_COMMERCIAL_MODULES ?= "0"
 
+CAN_USE_PYSIDE6 = "${@True if 'clang-layer' in d.getVar('BBFILE_COLLECTIONS').split() or \
+    os.path.exists(os.path.join(d.getVar('COREBASE'),'meta/recipes-devtools/clang')) else False}"
+
 # License mapping back to old license files
 SPDXLICENSEMAP[GFDL-1.3-no-invariants-only] = "GFDL-1.3"

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-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-python/pyside6/python3-pyside6.inc

@@ -0,0 +1,33 @@
+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)"
+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-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 \
+"
+
+python() {
+    if not bb.utils.to_boolean(d.getVar('CAN_USE_PYSIDE6')):
+        raise bb.parse.SkipRecipe('clang is not available.')
+}
+
+inherit setuptools3
+inherit qt6-cmake
+
+require recipes-qt/qt6/qt6-git.inc
+
+QT_GIT_PROJECT = "pyside"
+QT_MODULE = "pyside-setup"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/pyside6:"
+
+EXTRA_OECMAKE += "\
+    -DBUILD_TESTS=FALSE \
+    -DQFP_PYTHON_SITE_PACKAGES=${PYTHON_SITEPACKAGES_DIR} \
+"
+EXTRA_OECMAKE:append:class-target = " -DQFP_SHIBOKEN_HOST_PATH=${STAGING_EXECPREFIXDIR} -DQFP_PYTHON_HOST_PATH=${PYTHON}"
+
+INSANE_SKIP:${PN} += "already-stripped"

recipes-python/pyside6/python3-pyside6_git.bb

@@ -0,0 +1,71 @@
+require python3-pyside6.inc
+
+DEPENDS += "\
+    python3-shiboken6 \
+    python3-shiboken6-native \
+    ${PYSIDE_QT_MODULES} \
+"
+PYSIDE_QT_MODULES ?= "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d', '', d)} \
+    qtbase \
+    qtcharts \
+    qtconnectivity \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdatavis3d', '', d)} \
+    qtdeclarative \
+    qtdeclarative-native \
+    qtgraphs \
+    ${@bb.utils.contains('QT_COMMERCIAL_MODULES', '1', 'qthttpserver', '', d)} \
+    qtlocation \
+    qtmultimedia \
+    qtnetworkauth \
+    qtpositioning \
+    qtquick3d \
+    qtquick3d-native \
+    qtremoteobjects \
+    qtremoteobjects-native \
+    qtscxml \
+    qtscxml-native \
+    qtsensors \
+    qtserialbus \
+    qtserialport \
+    qtspeech \
+    qtsvg \
+    qttools \
+    qtwebchannel \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)} \
+    qtwebsockets \
+"
+
+OECMAKE_SOURCEPATH = "${S}/sources/pyside6"
+
+export LLVM_INSTALL_DIR = "${STAGING_DIR_NATIVE}${exec_prefix}"
+
+PYSIDE_COMPILER = "${HOST_SYS}-g++"
+PYSIDE_COMPILER:toolchain-clang = "${HOST_SYS}-clang++"
+# Workaround big.LITTLE architecture args not supported by clang
+PYSIDE_COMPILER_FLAGS = "${@d.getVar('HOST_CC_ARCH') \
+    .replace('cortex-a15.cortex','cortex') \
+    .replace('cortex-a17.cortex','cortex') \
+    .replace('cortex-a57.cortex','cortex') \
+    .replace('cortex-a72.cortex','cortex') \
+    .replace('cortex-a73.cortex','cortex') \
+    .replace('cortex-a75.cortex','cortex') \
+    .replace('cortex-a76.cortex','cortex')} \
+"
+
+EXTRA_OECMAKE += "\
+    -DSTANDALONE=ON \
+    -DPYSIDE_TREAT_QT_INCLUDE_DIRS_AS_NON_SYSTEM=ON \
+    -DSHIBOKEN_GENERATOR_EXTRA_FLAGS='\
+        --clang-options=--sysroot=${STAGING_DIR_TARGET},--target=${HOST_SYS},${@d.getVar('PYSIDE_COMPILER_FLAGS').replace(' ',',')} \
+        --compiler-path=${PYSIDE_COMPILER} \
+    ' \
+"
+
+FILES:${PN} += "\
+    ${QT6_INSTALL_PLUGINSDIR}/designer \
+"
+FILES:${PN}-dev += "\
+    ${datadir}/PySide6 \
+"

recipes-python/pyside6/python3-shiboken6_git.bb

@@ -0,0 +1,16 @@
+require python3-pyside6.inc
+
+DEPENDS += "qtbase clang-native python3-shiboken6-native"
+
+OECMAKE_SOURCEPATH = "${S}/sources/shiboken6"
+
+EXTRA_OECMAKE += "-DSHIBOKEN_BUILD_LIBS=ON"
+
+do_install:append() {
+    # shiboken6.pc in package python3-shiboken6-dev contains reference to TMPDIR [buildpaths]
+    sed -i ${D}${QT6_INSTALL_LIBDIR}/pkgconfig/shiboken6.pc \
+        -e '/^python_/d' \
+        -e 's|${RECIPE_SYSROOT}||'
+}
+
+BBCLASSEXTEND = "native nativesdk"

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

@@ -15,6 +15,8 @@ RDEPENDS:${PN} += " \
     nativesdk-qtgrpc-tools \
     nativesdk-qtquick3d-dev \
     nativesdk-qtquick3d-tools \
+    nativesdk-qtopcua-dev \
+    nativesdk-qtopcua-tools \
     nativesdk-qtremoteobjects-dev \
     nativesdk-qtremoteobjects-tools \
     nativesdk-qtscxml-dev \

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

@@ -8,6 +8,7 @@ inherit packagegroup
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS:${PN} += " \
+    ${@'python3-pyside6' if bb.utils.to_boolean(d.getVar('CAN_USE_PYSIDE6')) else ''} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d', '', d)} \
     qt5compat \
     qtapplicationmanager \
@@ -50,20 +51,25 @@ RDEPENDS:${PN} += " \
 
 RDEPENDS:${PN}:append:aarch64 = "\
     qtquick3dphysics \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
 "
 RDEPENDS:${PN}:append:arm = " qtquick3dphysics"
 RDEPENDS:${PN}:append:armv6 = "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
 "
 RDEPENDS:${PN}:append:armv7a = "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
 "
 RDEPENDS:${PN}:append:armv7ve = "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
 "
 RDEPENDS:${PN}:append:x86 = " qtquick3dphysics"
 RDEPENDS:${PN}:append:x86-64 = "\
     qtquick3dphysics \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
 "

recipes-qt/packagegroups/packagegroup-qt6-commercial-modules.bb

@@ -12,4 +12,5 @@ RDEPENDS:${PN} += " \
     qmlcompilerplus \
     qtinsighttracker \
     qtvncserver \
+    ${@'squish' if bb.utils.to_boolean(d.getVar('USE_SQUISH')) else ''} \
 "

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

@@ -12,6 +12,7 @@ RDEPENDS:${PN} += " \
     qtdeclarative \
     qtdeclarative-tools \
     qttools \
+    qttools-tools \
     qttranslations-qtbase \
     qttranslations-qtdeclarative \
 "

recipes-qt/qt6/gn-utils.inc

@@ -50,6 +50,20 @@ def gn_host_pkg_config(d):
     """Return absolute paths to pkg-config-native."""
     return d.getVar("STAGING_BINDIR_NATIVE") + "/" + "pkg-config-native"
 
+def gn_clang(d):
+    """Return true if using clang compiler else return false"""
+    if "clang++" in d.getVar("CXX"):
+        return "true"
+    else:
+        return "false"
+
+def gn_clang_native(d):
+    """Return true if using native clang compiler else return false"""
+    if "clang++" in d.getVar("BUILD_CXX"):
+        return "true"
+    else:
+        return "false"
+
 def write_toolchain_file(d, file_path):
     """Creates a complete GN toolchain file in |file_path|."""
     import string
@@ -72,7 +86,7 @@ def write_toolchain_file(d, file_path):
         '  toolchain_args = {\n'
         '    current_cpu = "${current_cpu}"\n'
         '    current_os = "linux"\n'
-        '    is_clang = false\n'
+        '    is_clang = ${is_clang}\n'
         '    host_pkg_config = "${host_pkg_config}"\n'
         '  }\n'
         '}\n'
@@ -80,6 +94,7 @@ def write_toolchain_file(d, file_path):
 
     native_toolchain = {
         'toolchain_name': 'yocto_native',
+        'is_clang': gn_clang_native(d),
         'current_cpu': gn_host_arch_name(d),
         'host_pkg_config': gn_host_pkg_config(d),
         'cc': d.expand('${BUILD_CC}'),
@@ -94,6 +109,7 @@ def write_toolchain_file(d, file_path):
     }
     target_toolchain = {
         'toolchain_name': 'yocto_target',
+        'is_clang': gn_clang(d),
         'current_cpu': gn_target_arch_name(d),
         'host_pkg_config': gn_host_pkg_config(d),
         'cc': d.expand('${CC}'),

recipes-qt/qt6/qt3d_git.bb

@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = " \
     file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
     file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
     file://src/3rdparty/assimp/LICENSE;md5=2119edef0916b0bd511cb3c731076271 \
-    file://src/3rdparty/imgui/LICENSE_imstb.txt;md5=2c03212e4ad1f727e9c2251327812596 \
-    file://src/3rdparty/imgui/LICENSE_proggyclean.txt;md5=f9db3a4f99ffc4d38de6bb590db15f31 \
+    file://src/3rdparty/imgui/LICENSE.imstb.txt;md5=2c03212e4ad1f727e9c2251327812596 \
+    file://src/3rdparty/imgui/LICENSE.proggyclean.txt;md5=f9db3a4f99ffc4d38de6bb590db15f31 \
     file://src/3rdparty/imgui/LICENSE.txt;md5=875a54e93593c8b244ef6b78cacc336e \
 "
 
@@ -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/qt5compat_git.bb

@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
     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 \
-    file://src/core5/codecs/QTSCIICODEC_LICENSE.txt;md5=f36a16de69d08da0af83ce2a672d8972 \
+    file://src/core5/codecs/LICENSE.QTSCIICODEC.txt;md5=f36a16de69d08da0af83ce2a672d8972 \
 "
 
 inherit qt6-cmake

recipes-qt/qt6/qt6-git.inc

@@ -4,69 +4,71 @@ HOMEPAGE ?= "https://www.qt.io"
 inherit srcrev-update
 
 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "dev"
+QT_MODULE_BRANCH ?= "6.9"
 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 = "96375439f337c8bc74ef5a7e08cd2e6727d60c8a"
-SRCREV_tqtc-qtinsighttracker = "d4be356120041c18ca650e5abce765e0f2e2ab74"
-SRCREV_tqtc-qtvncserver = "80d234538dd37a9ab56a8020e3d138e30e67e9e9"
-SRCREV_qt3d = "219dd44a26cf4323c1a3ba1c7a48ac5f1596b5ba"
-SRCREV_qt3d-assimp = "647f94648c0ae24b9c6684383a9dbbc0e2fc23b7"
-SRCREV_qt5compat = "9e0fc26d8e087379ef3f860460c066274368c012"
-SRCREV_qtbase = "9cb0d48aae81c5436bda783b64721d0b77bc3f6c"
-SRCREV_qtapplicationmanager = "72bc601489447dc25c8c89e55b8d4b76407f1ab4"
-SRCREV_qtcharts = "f4aa9dffcfed508f1e7fb7a0f95cb0873ecd47c7"
-SRCREV_qtcoap = "24c6d9188107d0834b44b91517f58656a495d495"
-SRCREV_qtconnectivity = "d401180fc4bc59a4dbe279cd4cdf3f4325d6e210"
-SRCREV_qtdatavis3d = "3e7d0a477a0fe97e8de7669b8d4460c8280c2887"
-SRCREV_qtdeclarative = "f5673f1e0e139fab33a456275b015fe4e5ca3986"
-SRCREV_qtdeviceutilities = "1acfa1025584812d7b0008812fa5aa83ce28720a"
-SRCREV_qtdoc = "7d49bbdf12829df94719f5a53de9f20f76b7502b"
-SRCREV_qtgraphs = "59085abc6574fdfd222bc9e9b0473093e5344360"
-SRCREV_qtgrpc = "bfd24967bc26373f4920e3505cd3d4fd28e70687"
-SRCREV_qthttpserver = "45c60e30e0a4a411162365cf01aafc1b0cba201c"
-SRCREV_qtimageformats = "08d1bb474949c2d4f886928198bcf4cbf70ce724"
-SRCREV_qtinterfaceframework = "6f81e3808a87d5faee60b68e2adc59073d9862e1"
-SRCREV_qtlanguageserver = "5f998f06ebd2aeedad839eb33b303fb44a10aaa9"
-SRCREV_qtlocation = "ea636dd72f823c20c988b05230b7fbf5ea4aca4d"
-SRCREV_qtlottie = "0fd4a8f813e0a0395de2b4374935fe6023d3afce"
-SRCREV_qtmqtt = "aeac9f7e171205bb9c47eb6479cfd3d31768f312"
-SRCREV_qtmultimedia = "f68eef36f234acfa4e99e1c8ba1d9ed8119a8f44"
-SRCREV_qtnetworkauth = "2f263f7028d2933c5e536c16f5622349053e682d"
-SRCREV_qtopcua = "7055c65fc10b2fdec80fe957768bdf27f7874ce1"
-SRCREV_qtpositioning = "7db6885dce399ad7ef47493c612127b71d3b229d"
-SRCREV_qtquick3d = "575612ae6be6811226e794e68009db046d7ad780"
-SRCREV_qtquick3d-assimp = "647f94648c0ae24b9c6684383a9dbbc0e2fc23b7"
-SRCREV_qtquick3dphysics = "85f5ad2048d5fa11a0d9086cdb6a1dce549b44de"
-SRCREV_qtquickdesigner-components = "04a5f670d3e7ae28e54bf194a3dd70e13d05ffc4"
-SRCREV_qtquicktimeline = "9e0a9979f2fe9eeead3c16311d0e3b8d6d5bbb8d"
-SRCREV_qtremoteobjects = "392a215a2ad716b9cc60311da2d8b09af149753e"
-SRCREV_qtscxml = "253845885a6e293f0c4dbbd3d53131afd7b88f9c"
-SRCREV_qtsensors = "9a2f543f523bfe3519c4b7d2c56b03393d21fe88"
-SRCREV_qtserialbus = "19335acb87270d0768609b2e6bf708c7deac14ec"
-SRCREV_qtserialport = "125813ab104a417ea168eeda8842ca1a51a4453e"
-SRCREV_qtshadertools = "ce3904c1b29b8960b623dee229f7fabdc7d14bd0"
-SRCREV_qtspeech = "da727c8dcc725c0f213e17cf68b2e7616d87ae66"
-SRCREV_qtsvg = "f4de0d25d1faeb131b5fd6d37bd2ab2cbd27ab47"
-SRCREV_qttools = "3557f0897aa2624b633a0bb83f1970245de37e1f"
-SRCREV_qttools-qlitehtml = "5cab3a508ab3e38bf8ec192e6fad3be1dedd3587"
+SRCREV_tqtc-qmlcompilerplus = "56d9ea16359c0fbdc21b298680dce6b7f632b485"
+SRCREV_tqtc-qtinsighttracker = "520413c31f92b8e331d59cd127ad14d1d92d60f8"
+SRCREV_tqtc-qtvncserver = "6df587d8408d5fb6867a9a822b0fe879912d8c6c"
+SRCREV_qt3d = "4f975511dc2b09ae6cd1b4489eafe1ce05dae48a"
+SRCREV_pyside-setup = "01d24a8f81d82afdb513e484d0ef63609d0fe528"
+SRCREV_qt3d-assimp = "488a2f7af2920295ada886f113a0d563dab79b8d"
+SRCREV_qt5compat = "17b8b1fa09abc3f3c1fa8b2895d11bdb90c70d2e"
+SRCREV_qtbase = "be09b211db70e1b0155d05c18668ad76e7e3df51"
+SRCREV_qtapplicationmanager = "1f46cba44b6ad37e2d1969c08d99e5bdbd0a86e5"
+SRCREV_qtcharts = "d01ef2860dcec8b1dd1f6a88adb410eddaf13fa6"
+SRCREV_qtcoap = "2122afda522ab7fcf61d385639c28e7ea8c084b1"
+SRCREV_qtconnectivity = "cdddcde30493478ec7c4665ca7851ed1606d1452"
+SRCREV_qtdatavis3d = "ceefcc27f7e27217a8f5c52a1785966a0e7b15fd"
+SRCREV_qtdeclarative = "c1640ba76059882e1d2bc978b6904a19333be4a9"
+SRCREV_qtdeviceutilities = "cc911b1ecfffc0cd515b2aa492ee73e703616b9f"
+SRCREV_qtdoc = "1e089e32daadf09d7395444a2e327a28c72ea139"
+SRCREV_qtgraphs = "8350480f6c0635a3e02fffee6f7d86c67d9e1ca1"
+SRCREV_qtgrpc = "bcb440d1af92d4a51882716f88b85445f7c7b421"
+SRCREV_qthttpserver = "29d45a55b96ee66d3016d99f4a991849b2e22f2d"
+SRCREV_qtimageformats = "7484973d606d212ae9b770b6a3be0dbce11f32e0"
+SRCREV_qtinterfaceframework = "203c10b2f643fd1582531ce0a67c20f78e36bc4c"
+SRCREV_qtlanguageserver = "ffedfaeb298f8c3b982f02843d380bb28227382e"
+SRCREV_qtlocation = "8cf2e051cc552026e82663ead65b66ece5a30eda"
+SRCREV_qtlottie = "833fef1bfc28b3e293381a12113322951a712eba"
+SRCREV_qtmqtt = "d10680d72685d999927b090ca81de2802d89407f"
+SRCREV_qtmultimedia = "0bbd3bc533aae9079e94d9c903a509239514aea7"
+SRCREV_qtnetworkauth = "b0ab508489ed0dc92916792cac3c20b6b44ab73b"
+SRCREV_qtopcua = "dc9fbd4f16065d8ad78dbdca4d6675fc4db896e9"
+SRCREV_qtpositioning = "e1cfddb24f97f65527478005aa2e26bb21688c10"
+SRCREV_qtquick3d = "ce612371bca2f01e55a2a4a20d652a86dc47e01c"
+SRCREV_qtquick3d-assimp = "488a2f7af2920295ada886f113a0d563dab79b8d"
+SRCREV_qtquick3dphysics = "e86756999b796ce2581a00db200fa73c5bcbba46"
+SRCREV_qtquickdesigner-components = "8c9e0faa0dd8b8adf019e357212e59898a7bebfb"
+SRCREV_qtquicktimeline = "a5690fce73901711ad21e92d5b7b59591c4da42e"
+SRCREV_qtremoteobjects = "ba20e19946a0b615527671ac05696407b601efaf"
+SRCREV_qtscxml = "660bc9c26f3489c5056d25fa92881e72d7c0081e"
+SRCREV_qtsensors = "939714166fd55c7acb25be8049f39b4e6fd747c5"
+SRCREV_qtserialbus = "a200e4f970a488da8b96e6cb7c788aabbf805608"
+SRCREV_qtserialport = "1ed03ae86db4c7319f7aaedd5374da1278bdd040"
+SRCREV_qtshadertools = "d02f2a004353044596123e2eaa877af2245587d4"
+SRCREV_qtspeech = "0b9c53d026a67286c42c9c646d3eee6626237d58"
+SRCREV_qtsvg = "84a5bad7715ac1a05043014a0f81f636117290da"
+SRCREV_qttools = "89031fa54058af5e4d92ee08d31642ca338e9c0c"
+SRCREV_qttools-qlitehtml = "3fe5821dad98747d6e41c9ed54b86c3d0eee9daf"
 SRCREV_qttools-qlitehtml-litehtml = "6ca1ab0419e770e6d35a1ef690238773a1dafcee"
-SRCREV_qttranslations = "437e02421ddfad8ad0480f4ccf20b1abf647acbd"
-SRCREV_qtvirtualkeyboard = "8a59f19d1b0b56fa3430927e4800d278e8d53746"
-SRCREV_qtwayland = "a8018eced508e2afffba4dfb20d04a23a184d7f9"
-SRCREV_qtwebchannel = "a13deb0fbd2f0af0c23311b83c3783ab27140a56"
-SRCREV_qtwebengine = "bee04d31444c6dc2976beee9ad7d974f83633e41"
-SRCREV_qtwebengine-chromium = "4140e17e7f2935fcdd4816c4050e4d2eebda2be9"
-SRCREV_qtwebsockets = "508323d509354719754e12008b70199fe018d62b"
-SRCREV_qtwebview = "ac1a751e6f60748dc2a6bdf54569610fdc432efb"
+SRCREV_qttranslations = "59bf5e665fd9629e06564fdd9ceed5c3197c7eca"
+SRCREV_qtvirtualkeyboard = "2fda9f58f8b29ac7d03017e4a235bd7e9921b7f3"
+SRCREV_qtwayland = "d6b7b0714c546ae5920b1681d29cdabf06caa106"
+SRCREV_qtwebchannel = "c40e05665b255ff1a8a5e552eae6ce2c99cbefe6"
+SRCREV_qtwebengine = "f1f376f88263616b6b8a6cac3de8aebb10c76977"
+SRCREV_qtwebengine-chromium = "064efb300efcdaebede8d84e58dd6a221fecc36f"
+SRCREV_qtwebsockets = "5071d82808f292c08de30d1e6e54cf83ffb218ba"
+SRCREV_qtwebview = "04c2faf2537f6bb8c652cba769af0b09f5a4612b"

recipes-qt/qt6/qt6-ptest.inc

@@ -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/qt6.inc

@@ -121,9 +121,7 @@ FILES:${PN}-staticdev += " \
     ${QT6_INSTALL_QMLDIR}/*/*/*/*/objects*/ \
 "
 
-# Note: INSTALL_EXAMPLESDIR is not used
 FILES:${PN}-examples = " \
     ${QT6_INSTALL_EXAMPLESDIR} \
-    ${prefix}/examples \
 "
 RDEPENDS:${PN}-examples = "${PN}"

recipes-qt/qt6/qtapplicationmanager_git.bb

@@ -14,6 +14,7 @@ include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtdeclarative libyaml libarchive qtapplicationmanager-native"
+DEPENDS:append:class-target = " qthttpserver"
 DEPENDS:append:libc-musl = " libexecinfo"
 RDEPENDS:${PN}:class-target = "libcrypto ${PN}-tools"
 
@@ -23,13 +24,14 @@ PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'multi-proc
 
 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[bubblewrap] = "-DFEATURE_am_bubblewrap_container=ON,-DFEATURE_am_bubblewrap_container=OFF,,bubblewrap"
 
 PACKAGECONFIG:class-native ??= "tools-only"
 PACKAGECONFIG:class-nativesdk ??= "${PACKAGECONFIG:class-native}"
 
 FILES:${PN}-tools = "\
+    ${QT6_INSTALL_BINDIR}/appman-package-server* \
     ${QT6_INSTALL_BINDIR}/appman-packager* \
-    ${QT6_INSTALL_BINDIR}/appman-dumpqmltypes* \
     ${QT6_INSTALL_BINDIR}/appman-qmltestrunner* \
 "
 

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

@@ -1,4 +1,4 @@
-From 4064b8757cbb28588fdff2529ea203bf3eabc579 Mon Sep 17 00:00:00 2001
+From 27896986b3c2930ccbbe062d3e7a0b7bcc08caf1 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
@@ -20,20 +20,20 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index 92729b06f1..dac7857600 100644
+index 4b116c54b2e..bfa21c997b4 100644
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -101,7 +101,12 @@ static QSettings *findConfiguration()
+@@ -103,7 +103,12 @@ static std::unique_ptr<QSettings> findConfiguration()
      if (qtconfManualPath)
-         return new QSettings(*qtconfManualPath, QSettings::IniFormat);
+         return std::make_unique<QSettings>(*qtconfManualPath, QSettings::IniFormat);
  
 -    QString qtconfig = QStringLiteral(":/qt/etc/qt.conf");
 +    QByteArray config = getenv("OE_QMAKE_QTCONF_PATH");
 +    QString qtconfig = QFile::decodeName(config);
 +    if (QFile::exists(qtconfig))
-+        return new QSettings(qtconfig, QSettings::IniFormat);
++        return std::make_unique<QSettings>(qtconfig, QSettings::IniFormat);
 +
 +    qtconfig = QStringLiteral(":/qt/etc/qt.conf");
-     if (QFile::exists(qtconfig))
-         return new QSettings(qtconfig, QSettings::IniFormat);
+     if (QResource(qtconfig, QLocale::c()).isValid())
+         return std::make_unique<QSettings>(qtconfig, QSettings::IniFormat);
  #ifdef Q_OS_DARWIN

recipes-qt/qt6/qtbase_git.bb

@@ -19,10 +19,12 @@ include recipes-qt/qt6/qt6.inc
 
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
-    file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
     file://0004-Fix-qt.toolchain.cmake-for-SDK-use.patch \
     file://0005-testlib-don-t-track-the-build-or-source-directories.patch \
 "
+SRC_URI:append:class-native = "\
+    file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+"
 
 DEPENDS += "\
     patchelf-native \
@@ -53,16 +55,18 @@ 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', 'x11', 'gl', 'kms gbm gles2 eglfs', d), 'no-opengl', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
+    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 \
@@ -94,9 +98,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 requires XCB currently
-ACCESSIBILITY_DEPENDS = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "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"
@@ -120,17 +121,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"
@@ -194,6 +196,11 @@ do_install:append() {
     rm -f ${D}${QT6_INSTALL_MKSPECSDIR}/features/uikit/device_destinations.sh
     rm -f ${D}${QT6_INSTALL_MKSPECSDIR}/features/data/mac/objc_namespace.sh
 
+    if [ -e ${D}${QT6_INSTALL_EXAMPLESDIR}/corelib/serialization/cbordump/cbortag.py ]; then
+        sed -i ${D}${QT6_INSTALL_EXAMPLESDIR}/corelib/serialization/cbordump/cbortag.py \
+            -e 's|/bin/env|/usr/bin/env|'
+    fi
+
     # remove unneeded files that contains reference to TMPDIR [buildpaths]
     rm -f ${D}${QT6_INSTALL_BINDIR}/host-*
     rm -f ${D}${QT6_INSTALL_BINDIR}/target_qt.conf
@@ -207,7 +214,10 @@ EOF
 
     RELPATH="${@os.path.relpath(d.getVar('bindir'), d.getVar('QT6_INSTALL_BINDIR'))}"
     sed -i ${D}${QT6_INSTALL_BINDIR}/* \
-        -i ${D}${QT6_INSTALL_LIBEXECDIR}/* \
+        -e "s|cmake_path=${RECIPE_SYSROOT_NATIVE}.*cmake|cmake_path=%script_dir_path%/$RELPATH/cmake.exe|" \
+        -e "s|${RECIPE_SYSROOT_NATIVE}.*cmake|\$script_dir_path/$RELPATH/cmake|"
+    RELPATH="${@os.path.relpath(d.getVar('bindir'), d.getVar('QT6_INSTALL_LIBEXECDIR'))}"
+    sed -i ${D}${QT6_INSTALL_LIBEXECDIR}/* \
         -e "s|cmake_path=${RECIPE_SYSROOT_NATIVE}.*cmake|cmake_path=%script_dir_path%/$RELPATH/cmake.exe|" \
         -e "s|${RECIPE_SYSROOT_NATIVE}.*cmake|\$script_dir_path/$RELPATH/cmake|"
 

recipes-qt/qt6/qtconnectivity_git.bb

@@ -14,9 +14,10 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
+DEPENDS += "qtbase"
 
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
 PACKAGECONFIG[bluez] = "-DFEATURE_bluez=ON,-DFEATURE_bluez=OFF,bluez5"
+PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtdeclarative-native"
 
 FILES:${PN}-tools = ""

recipes-qt/qt6/qtdoc_git.bb

@@ -29,13 +29,13 @@ DEPENDS += "\
     qtsvg \
     qtwebsockets \
 "
-DEPENDS:append:aarch64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)} qtquick3dphysics"
+DEPENDS:append:aarch64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} qtquick3dphysics"
 DEPENDS:append:arm = " qtquick3dphysics"
-DEPENDS:append:armv6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)}"
-DEPENDS:append:armv7a = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)}"
-DEPENDS:append:armv7ve = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)}"
+DEPENDS:append:armv6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)}"
+DEPENDS:append:armv7a = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)}"
+DEPENDS:append:armv7ve = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)}"
 DEPENDS:append:x86 = " qtquick3dphysics"
-DEPENDS:append:x86-64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)} qtquick3dphysics"
+DEPENDS:append:x86-64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} qtquick3dphysics"
 
 PACKAGECONFIG ?= "examples"
 

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,11 +13,10 @@ 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[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtdeclarative-native"
+PACKAGECONFIG ?= "qml"
+PACKAGECONFIG[qml] = "-DFEATURE_grpcquick=ON,-DFEATURE_grpcquick=OFF,qtdeclarative qtdeclarative-native"
 
 # workaround for missing protobuf support on kirkstone
 ALLOW_EMPTY:${PN}-tools = "1"

recipes-qt/qt6/qtopcua_git.bb

@@ -24,8 +24,11 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-PACKAGECONFIG ?= "qml"
+PACKAGECONFIG ?= "qml open62541"
+PACKAGECONFIG:class-native ?= ""
+PACKAGECONFIG:class-nativesdk ?= ""
 PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
+PACKAGECONFIG[open62541] = "-DFEATURE_open62541=ON,-DFEATURE_open62541=OFF,openssl"
 
 # src/3rdparty/open62541.pri adds -Wno-format, causing following error
 # because -Wformat-security cannot be used together with -Wno-format

recipes-qt/qt6/qtpdf_git.bb

@@ -34,6 +34,5 @@ do_install:append() {
     # remove conflicting files with QtWebEngine
     rm -f ${D}${libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtWebEngineTestsConfig.cmake
     rm -f ${D}${libdir}/cmake/Qt6/Find*.cmake
-    # rename sbom
-    mv ${D}${libdir}/sbom/qtwebengine-${QT_VERSION}.spdx ${D}${libdir}/sbom/qtpdf-${QT_VERSION}.spdx
+    rm -f ${D}${libdir}/sbom/qtwebengine*
 }

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/qtsvg_git.bb

@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
     file://LICENSES/HPND-sell-variant.txt;md5=46bb75504ccdcac579aa4fee538e6c39 \
     file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
     file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
-    file://src/svg/XSVG_LICENSE.txt;md5=46bb75504ccdcac579aa4fee538e6c39 \
+    file://src/svg/LICENSE.XSVG.txt;md5=46bb75504ccdcac579aa4fee538e6c39 \
 "
 
 inherit qt6-cmake

recipes-qt/qt6/qttools_git.bb

@@ -18,19 +18,22 @@ 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 \
 "
 
 DEPENDS += "qtbase qtdeclarative qttools-native"
 
-QTTOOLS_USE_CLANG ?= "${@ 'clang' if bb.utils.vercmp_string_op(d.getVar('LLVMVERSION') or '', '17', '>') else ''}"
+CAN_USE_CLANG = "${@True if bb.utils.vercmp_string_op(d.getVar('LLVMVERSION') or '', '17', '>') or \
+    os.path.exists(os.path.join(d.getVar('COREBASE'),'meta/recipes-devtools/clang')) else False}"
+CAN_USE_CLANG:mingw32 = "False"
+
+QTTOOLS_USE_CLANG ?= "${@ 'clang' if bb.utils.to_boolean(d.getVar('CAN_USE_CLANG')) else ''}"
 PACKAGECONFIG:class-native = "${QTTOOLS_USE_CLANG}"
 PACKAGECONFIG:class-nativesdk = "${QTTOOLS_USE_CLANG}"
-PACKAGECONFIG:remove:mingw32 = "${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/qttranslations_git.bb

@@ -27,4 +27,4 @@ python split_translation_packages () {
     d.setVar('RRECOMMENDS:' + pn, ' '.join(pkgs))
 }
 
-FILES:${PN}-dev = "${QT6_INSTALL_TRANSLATIONSDIR}/catalogs.json"
+FILES:${PN}-dev += "${QT6_INSTALL_TRANSLATIONSDIR}/catalogs.json"

recipes-qt/qt6/qtvirtualkeyboard_git.bb

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = " \
     file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
     file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
     file://src/plugins/openwnn/3rdparty/openwnn/NOTICE;md5=50e3e853eb9dd5ccdf6192678106b3da \
-    file://src/plugins/pinyin/3rdparty/pinyin/NOTICE;md5=506fbea94b9d051d6478776c50a4c66b \
+    file://src/plugins/pinyin/3rdparty/pinyin/NOTICE;md5=42ec637ebc122938c27a784b351dafef \
     file://src/plugins/tcime/3rdparty/tcime/COPYING;md5=1474257e03071e0ffb9ed0db6dac8954 \
 "
 
@@ -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/qtwayland_git.bb

@@ -19,7 +19,7 @@ REQUIRED_DISTRO_FEATURES = "wayland"
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-SRC_URI +="\
+SRC_URI += "\
     file://0001-Allow-qtwaylandscanner-to-be-built-without-dependenc.patch \
 "
 

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

@@ -21,17 +21,20 @@ inherit gettext
 inherit perlnative
 inherit python3native
 
+inherit features_check
+REQUIRED_DISTRO_FEATURES = "opengl"
+
 # we don't want gettext.bbclass to append --enable-nls
 def gettext_oeconf(d):
     return ""
 
 QT_MODULE = "qtwebengine"
-QT_MODULE_BRANCH_CHROMIUM = "126-based"
+QT_MODULE_BRANCH_CHROMIUM = "130-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/0001-CMake-use-generated-yocto-toolchains.patch

@@ -1,4 +1,4 @@
-From efa68fdedbec60380946f69a6a2f985958148e83 Mon Sep 17 00:00:00 2001
+From a485259228b3692e7874c6d5a2b41f91da47fa4c 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
@@ -11,15 +11,15 @@ target binaries where needed.
 Upstream-Status: Inappropriate [embedded specific]
 Change-Id: I217c9122144f25bb2d28717e7248c2a51b149127
 ---
- cmake/Functions.cmake | 12 +++++-------
- src/CMakeLists.txt    |  2 +-
+ cmake/QtToolchainHelpers.cmake | 12 +++++-------
+ src/CMakeLists.txt             |  2 +-
  2 files changed, 6 insertions(+), 8 deletions(-)
 
-diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
-index 3371e5ff5..ac889d3f7 100644
---- a/cmake/Functions.cmake
-+++ b/cmake/Functions.cmake
-@@ -825,7 +825,7 @@ endfunction()
+diff --git a/cmake/QtToolchainHelpers.cmake b/cmake/QtToolchainHelpers.cmake
+index eaa3a4339..9a6d57945 100644
+--- a/cmake/QtToolchainHelpers.cmake
++++ b/cmake/QtToolchainHelpers.cmake
+@@ -210,7 +210,7 @@ endfunction()
  
  macro(create_pkg_config_host_wrapper buildDir)
      find_package(PkgConfigHost)
@@ -28,7 +28,7 @@ index 3371e5ff5..ac889d3f7 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()
-@@ -1097,14 +1097,12 @@ macro(append_toolchain_setup)
+@@ -551,14 +551,12 @@ macro(append_toolchain_setup)
      elseif(LINUX)
          get_gn_arch(cpu ${TEST_architecture_arch})
          list(APPEND gnArgArg
@@ -48,14 +48,14 @@ index 3371e5ff5..ac889d3f7 100644
              list(APPEND gnArgArg host_cpu="${cpu}")
          endif()
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0084697f2..1c9059ae6 100644
+index 453b2c1b6..6b8c5c254 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -161,7 +161,7 @@ endif()
+@@ -114,7 +114,7 @@ endif()
  #  HOST PROJECT
  ##
  
--if(CMAKE_CROSSCOMPILING AND NOT IOS AND NOT MACOS)
+-if(CMAKE_CROSSCOMPILING AND NOT IOS AND NOT MACOS AND NOT WIN32)
 +if(FALSE)
  
      if(NOT Gn_FOUND)

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

@@ -1,4 +1,4 @@
-From 23d02fd87c766b6aef2a5aa81186b3db3f13b82a Mon Sep 17 00:00:00 2001
+From 03c0f7089ee4f54883073f9df23d379da35c9f35 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,10 +16,10 @@ 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 d868696dbf2..298273818ef 100644
+index 35c8c606a22..d3097e55e56 100644
 --- a/chromium/tools/v8_context_snapshot/BUILD.gn
 +++ b/chromium/tools/v8_context_snapshot/BUILD.gn
-@@ -72,6 +72,7 @@ if (use_v8_context_snapshot) {
+@@ -46,6 +46,7 @@ if (use_v8_context_snapshot) {
        output_path = rebase_path(output_file, root_build_dir)
  
        args = [
@@ -28,10 +28,10 @@ index d868696dbf2..298273818ef 100644
                                            "root_out_dir") +
                                 "/v8_context_snapshot_generator",
 diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn
-index 2f99c3d70b0..9b28cf2ed4c 100644
+index dcc3acbf8b3..c1fc540971a 100644
 --- a/chromium/v8/BUILD.gn
 +++ b/chromium/v8/BUILD.gn
-@@ -1870,6 +1870,7 @@ template("run_torque") {
+@@ -2240,6 +2240,7 @@ template("run_torque") {
      }
  
      args = [
@@ -39,7 +39,7 @@ index 2f99c3d70b0..9b28cf2ed4c 100644
        "./" + rebase_path(
                get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
                root_build_dir),
-@@ -2002,6 +2003,7 @@ action("generate_bytecode_builtins_list") {
+@@ -2403,6 +2404,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,15 +47,15 @@ index 2f99c3d70b0..9b28cf2ed4c 100644
      "./" + rebase_path(
              get_label_info(
                      ":bytecode_builtins_list_generator($v8_generator_toolchain)",
-@@ -2047,6 +2049,7 @@ template("run_mksnapshot") {
-     data = []
+@@ -2475,6 +2477,7 @@ template("run_mksnapshot") {
+     }
  
-     args = [
+     args += [
 +      "../../../../v8-qemu-wrapper.sh",
        "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
                                          "root_out_dir") + "/mksnapshot",
                           root_build_dir),
-@@ -5849,6 +5852,7 @@ if (v8_enable_i18n_support) {
+@@ -7515,6 +7518,7 @@ if (v8_enable_i18n_support) {
      outputs = [ output_file ]
  
      args = [

recipes-qt/qt6/qtwebengine_git.bb

@@ -60,7 +60,7 @@ PACKAGECONFIG[libvpx] = "-DFEATURE_webengine_system_libvpx=ON,-DFEATURE_webengin
 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[ozone-x11] = "-DFEATURE_webengine_ozone_x11=ON,-DFEATURE_webengine_ozone_x11=OFF,libxcomposite libxcursor libxi libxrandr libxtst libxkbfile libxdamage virtual/libgl"
+PACKAGECONFIG[ozone-x11] = "-DFEATURE_webengine_ozone_x11=ON,-DFEATURE_webengine_ozone_x11=OFF,libxcomposite libxcursor libxi libxrandr libxtst libxkbfile libxdamage libxshmfence libdrm virtual/libgl"
 PACKAGECONFIG[libpci] = "-DFEATURE_webengine_system_libpci=ON,-DFEATURE_webengine_system_libpci=OFF,pciutils"
 PACKAGECONFIG[pepper-plugins] = "-DFEATURE_webengine_pepper_plugins=ON,-DFEATURE_webengine_pepper_plugins=OFF"
 PACKAGECONFIG[printing-and-pdf] = "-DFEATURE_webengine_printing_and_pdf=ON,-DFEATURE_webengine_printing_and_pdf=OFF,cups"
@@ -74,6 +74,11 @@ PACKAGECONFIG[webrtc] = "-DFEATURE_webengine_webrtc=ON,-DFEATURE_webengine_webrt
 PACKAGECONFIG[webrtc-pipewire] = "-DFEATURE_webengine_webrtc_pipewire=ON,-DFEATURE_webengine_webrtc_pipewire=OFF,pipewire glib-2.0 libepoxy virtual/libgbm"
 PACKAGECONFIG[zlib] = "-DFEATURE_webengine_system_zlib=ON -DFEATURE_webengine_system_minizip=ON,-DFEATURE_webengine_system_zlib=OFF -DFEATURE_webengine_system_minizip=OFF,zlib minizip"
 
+do_install:append() {
+    # remove conflicting files with QtPdf
+    rm -f ${D}${libdir}/sbom/qtpdf*
+}
+
 FILES:${PN} += "\
     ${QT6_INSTALL_TRANSLATIONSDIR} \
     ${QT6_INSTALL_DATADIR}/resources \

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"

recipes-qt/squish/squish_9.0.1.bb

@@ -0,0 +1,113 @@
+LICENSE = "Squish-Commercial-License-Agreement"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a25acc1c5f693af9921102a049958aa8"
+
+EXCLUDE_FROM_WORLD = "1"
+
+inherit qt6-qmake
+
+# location where Squish release packages can be downloaded
+SQUISH_MIRROR ?= ""
+SQUISH_LICENSE_KEY ?= ""
+
+python __anonymous() {
+    if not (d.getVar('SQUISH_MIRROR') and d.getVar('SQUISH_LICENSE_KEY')):
+        raise bb.parse.SkipRecipe("You need to define SQUISH_MIRROR and SQUISH_LICENSE_KEY in the config", d)
+}
+
+SQUISH_INSTALLER = "squish-${PV}-qt69x-linux64.run"
+
+SRC_URI = "\
+    ${SQUISH_MIRROR}/${SQUISH_INSTALLER};name=squish \
+    ${SQUISH_MIRROR}/squish-${PV}-qt-embedded-src.tar.gz;name=qt-squish-embedded;subdir=${BP};striplevel=1 \
+"
+
+SRC_URI[squish.sha256sum] = "4bad3059b3c24e1cbedea4ae261e0a1789ac0c4b74083c5216c8e4434354c53c"
+SRC_URI[qt-squish-embedded.sha256sum] = "91201fcd038e48d7fefc68a3ad25dc6814999129679600e130e5451cd1a37d4f"
+
+DEPENDS += "\
+    qtbase \
+    qt5compat \
+"
+
+PACKAGECONFIG ?= "\
+    appman \
+    qml \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \
+"
+PACKAGECONFIG[appman] = ",,qtapplicationmanager"
+PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
+PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,qtwayland qtwayland-native wayland wayland-native"
+
+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() {
+    SQUISH_INSTALLER=${UNPACKDIR}/${SQUISH_INSTALLER}
+    if [ ! -e $SQUISH_INSTALLER ]; then
+        SQUISH_INSTALLER=${WORKDIR}/${SQUISH_INSTALLER}
+    fi
+    chmod +x $SQUISH_INSTALLER
+    TMPDIR=${WORKDIR}/tmp XDG_RUNTIME_DIR=${WORKDIR}/tmp $SQUISH_INSTALLER \
+        -platform minimal unattended=1 targetdir=${WORKDIR}/squish ide=0 \
+        licensekey=${SQUISH_LICENSE_KEY}
+}
+
+do_configure() {
+    ${S}/configure \
+        --disable-all \
+        --enable-qmake-config \
+        --enable-qt \
+        --enable-server \
+        --with-qmake=${STAGING_DIR_NATIVE}${QT6_INSTALL_BINDIR}/qmake \
+        --with-squishidl=${WORKDIR}/squish/bin/squishidl \
+        ${PACKAGECONFIG_CONFARGS}
+}
+
+do_compile() {
+    ./build ${@oe.utils.parallel_make_argument(d, '-j%d')}
+}
+
+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
+
+    if [ -e ${D}/opt/squish/etc/squish-appman-hook.yaml ]; then
+        sed -i -e 's|PATH_TO_SQUISH|/opt/squish|' ${D}/opt/squish/etc/squish-appman-hook.yaml
+    fi
+
+    install -d ${D}${sysconfdir}/profile.d
+    cat > ${D}${sysconfdir}/profile.d/squish.sh <<EOF
+export SQUISH_PREFIX=/opt/squish
+export PATH="\$PATH:/opt/squish/bin"
+EOF
+}
+
+FILES:${PN} += "\
+    ${QT6_INSTALL_PLUGINSDIR} \
+    /opt/squish \
+"
+FILES:${PN}-dev += "\
+    /opt/squish/qtbuiltinhook.pri \
+    /opt/squish/LICENSE.txt \
+    /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
+
+INSANE_SKIP:${PN}-src += "buildpaths"