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

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

README.md

@@ -5,31 +5,41 @@ This layer depends on:
 
 URI: https://git.openembedded.org/openembedded-core/
 
+URI: https://git.openembedded.org/meta-openembedded/
+
 and optionally:
 
-URI: https://git.openembedded.org/meta-openembedded/
+URI: https://github.com/kraj/meta-clang
 
 Yocto version support
 ---------------------
 
-The branching of meta-qt6 layer follows Qt branching scheme, that is
-`dev` for the development branch, `6.x` for each minor release and
-`lts-6.x` for commercial LTS releases.
+The branching of meta-qt6 layer follows [Qt branching scheme](https://wiki.qt.io/Branch_Guidelines),
+that is `dev` for the development branch, `6.x` for minor stabilization branches,
+`6.x.y` for the release branches and `lts-6.x.y` for commercial LTS releases.
+
+Each Qt release is tagged either as `v6.x.y` or `v6.x.y-lts`
 
 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.5 | 6.4 | 6.3 | 6.2 |
-| ---------- |:---:|:---:|:---:|:---:|:---:|
-| master     |  x  |  x  |     |     |     |
-| mickledore |  x  |  x  |  x  |     |     |
-| langdale   |  x  |  x  |  x  |     |     |
-| kirkstone  |  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 | 6.6  | 6.5 | 6.4 | 6.3 | 6.2 |
+|:---------- |:----:|:---:|:---:|:---:|:---:|
+| scarthgap  |  x   |  x  |     |     |     |
+| nanbield   |  x   |  x  |     |     |     |
+| mickledore |  c   |  c  |  c  |     |     |
+| langdale   |  c   |  c  |  c  |     |     |
+| kirkstone  |  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  |
+|            |      |     |     |     |     |
+|            |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
 -------------
@@ -56,15 +66,30 @@ QtWebEngine
 QtWebEngine needs at least CMake 3.19, which is available starting from Hardknott.
 For this reason QtWebEngine is not tested on older releases.
 
+QtMultimedia
+------------
+
+Qt Multimedia now prefers [FFmpeg][1] as the multimedia backend instead of GStreamer.
+FFmpeg recipe, however, is flagged with LICENSE_FLAGS = "commercial", which means
+that user must accept the license before FFmpeg can be used in the build. If user
+accepts the license using LICENSE_FLAGS_ACCEPTED = 'commercial_ffmpeg', the FFmpeg
+support is enabled in Qt Multimedia. If user doesn't accept the license,
+Qt Multimedia only uses GStreamer.
+
+[1]: https://doc.qt.io/qt-6/qtmultimedia-index.html#ffmpeg-as-the-default-backend
+
 Contributing
 ------------
 
-To contribute to this layer you should submit the patches for review using
+To contribute to this layer submit the patches for review using
 [Qt Gerrit](https://codereview.qt-project.org).
 
 More information about Qt Gerrit and how to use it:
- - https://wiki.qt.io/Gerrit_Introduction
- - https://wiki.qt.io/Setting_up_Gerrit
+ - [Gerrit_Introduction](https://wiki.qt.io/Gerrit_Introduction)
+ - [Setting_up_Gerrit](https://wiki.qt.io/Setting_up_Gerrit)
+
+Report bugs on [Qt Bug Tracker](https://bugreports.qt.io) using
+`Yocto: meta-qt6 layer` component.
 
 Layer maintainers
 -----------------

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

@@ -7,7 +7,7 @@ accept_configuration:
       equals_value: Yocto
     - condition: property
       property: target.arch
-      in_values: [TARGET1, TARGET2, TARGET3, TARGET4, TARGET5]
+      in_values: [TARGET1, TARGET2, TARGET3, TARGET4, TARGET5, INSIGNIFICANT_TARGET1]
 
 machine_type:
   Build:
@@ -15,12 +15,12 @@ machine_type:
 
 # Target build matrix:
 #
-#           [target1]       [target2]   [target3]       [target4]       [target5]
-# [machine] qemuarm64       qemux86     qemuarm         qemux86-64      qemuarm64
-# [yocto]   kirkstone       langdale    mickledore      dunfell         master
-# [X11]     no              no          yes             yes             no
-# [mingw]   no              yes         no              no              no
-# [static]  no              no          no              no              yes
+#           [target1]       [target2]   [target3]       [target4]       [target5]     [target6]
+# [machine] qemuarm64       qemux86-64  qemuarm         qemux86         qemuarm64     qemuarm64
+# [yocto]   master          master      dunfell         nanbield        kirkstone     master
+# [wayland] yes             no          no              yes             yes           no
+# [mingw]   no              no          no              yes             no            no
+# [static]  no              no          no              no              yes           no
 #
 
 target1: &target1
@@ -31,7 +31,7 @@ target1: &target1
       variableValue: qemuarm64
     - type: EnvironmentVariable
       variableName: MANIFEST
-      variableValue: kirkstone.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: langdale.xml
+      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,10 +63,10 @@ target3: &target3
       variableValue: qemuarm
     - type: EnvironmentVariable
       variableName: MANIFEST
-      variableValue: mickledore.xml
+      variableValue: dunfell.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs
+      variableValue: ci configs dunfell no-webengine
   enable_if:
       condition: property
       property: target.arch
@@ -76,13 +76,13 @@ target4: &target4
   instructions:
     - type: EnvironmentVariable
       variableName: MACHINE
-      variableValue: qemux86-64
+      variableValue: qemux86
     - type: EnvironmentVariable
       variableName: MANIFEST
-      variableValue: dunfell.xml
+      variableValue: nanbield.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs dunfell no-webengine
+      variableValue: ci configs wayland mingw no-webengine
   enable_if:
       condition: property
       property: target.arch
@@ -95,7 +95,7 @@ target5: &target5
       variableValue: qemuarm64
     - type: EnvironmentVariable
       variableName: MANIFEST
-      variableValue: master.xml
+      variableValue: kirkstone.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
       variableValue: ci configs wayland static no-webengine
@@ -103,6 +103,22 @@ target5: &target5
       condition: property
       property: target.arch
       equals_value: TARGET5
+target6: &target6
+  type: Group
+  instructions:
+    - type: EnvironmentVariable
+      variableName: MACHINE
+      variableValue: qemuarm64
+    - type: EnvironmentVariable
+      variableName: MANIFEST
+      variableValue: master.xml
+    - type: EnvironmentVariable
+      variableName: TEST_CONFIGS
+      variableValue: ci configs wayland python
+  enable_if:
+      condition: property
+      property: target.arch
+      equals_value: INSIGNIFICANT_TARGET1
 
 instructions:
   Build:
@@ -111,6 +127,7 @@ instructions:
   - *target3
   - *target4
   - *target5
+  - *target6
   - type: EnvironmentVariable
     variableName: DL_DIR
     variableValue: "/mnt/yocto-cache/downloads"
@@ -149,6 +166,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

@@ -1,9 +1,5 @@
-PREFERRED_PROVIDER_udev = "systemd"
 # use systemd
-DISTRO_FEATURES:append = " systemd"
-DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
-VIRTUAL-RUNTIME_init_manager = "systemd"
-VIRTUAL-RUNTIME_initscripts = ""
+INIT_MANAGER:forcevariable = "systemd"
 
 INHERIT += "buildstats buildstats-summary"
 INHERIT += "rm_work"
@@ -31,10 +27,16 @@ EXTRA_QA = "\
 ERROR_QA:append = "${EXTRA_QA}"
 WARN_QA:remove = "${EXTRA_QA}"
 
+# workaround for qemu
+# nativesdk-qemu-user-mips rdepends on nativesdk-bash, but it isn't a build dependency
+INSANE_SKIP:nativesdk-qemu-user-mips = "build-deps"
+
 # enable thumb for broader test coverage (oe-core autobuilder doesn't have thumb enabled)
 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"

coin/test-python.inc

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

coin/test-static.inc

@@ -1,2 +1,3 @@
 PACKAGECONFIG:append:pn-qtbase = " static"
 QT_PTEST_ENABLED = "0"
+PACKAGECONFIG:remove:pn-qtapplicationmanager = "multi-process"

conf/layer.conf

@@ -18,6 +18,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 BBFILES_DYNAMIC += " \
     meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bb \
     meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bbappend \
+    openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes*/*/*.bbappend \
 "
 
 BBFILE_COLLECTIONS += "qt6-layer"
@@ -33,19 +34,22 @@ BBFILE_PRIORITY_qt6-layer = "${BBFILE_PRIORITY_core}"
 # cause compatibility issues with other layers
 LAYERVERSION_qt6-layer = "1"
 
-LAYERDEPENDS_qt6-layer = "core"
+LAYERDEPENDS_qt6-layer = "core openembedded-layer meta-python"
 
-LAYERSERIES_COMPAT_qt6-layer = "dunfell gatesgarth hardknott honister kirkstone langdale mickledore"
+LAYERSERIES_COMPAT_qt6-layer = "dunfell gatesgarth hardknott honister 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"
 QT_EDITION ?= "opensource"
-QT_VERSION = "6.6.0"
+QT_VERSION = "6.6.3"
 
 QT_COMMERCIAL_GIT ?= "git://codereview.qt-project.org"
 QT_COMMERCIAL_GIT_PROTOCOL ?= "ssh"
@@ -53,7 +57,4 @@ QT_COMMERCIAL_GIT_PROTOCOL ?= "ssh"
 QT_COMMERCIAL_MODULES ?= "0"
 
 # License mapping back to old license files
-SPDXLICENSEMAP[GPL-3.0-only] = "GPL-3.0"
-SPDXLICENSEMAP[LGPL-3.0-only] = "LGPL-3.0"
-SPDXLICENSEMAP[GPL-2.0-or-later] = "GPL-2.0"
 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-devtools/python/python3-appdirs_1.4.4.bbappend

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

recipes-python/pyqt6/python3-pyqt-builder-native_1.15.4.bb

@@ -0,0 +1,10 @@
+SUMMARY = "The PEP 517 compliant PyQt build system"
+HOMEPAGE = "https://pypi.org/project/PyQt-builder/"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9cd437778ebd1c056a76b4ded73b3a6d"
+
+SRC_URI[sha256sum] = "39f8c75db17d9ce17cb6bbf3df1650b5cebc1ea4e5bd73843d21cc96612b2ae1"
+
+inherit pypi setuptools3 native
+
+PYPI_PACKAGE = "PyQt-builder"

recipes-python/pyqt6/python3-pyqt6-sip_13.6.0.bb

@@ -0,0 +1,12 @@
+SUMMARY = "The sip module support for PyQt6"
+HOMEPAGE = "https://pypi.org/project/PyQt6-sip/"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=9cd437778ebd1c056a76b4ded73b3a6d"
+
+SRC_URI[sha256sum] = "2486e1588071943d4f6657ba09096dc9fffd2322ad2c30041e78ea3f037b5778"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "PyQt6_sip"
+
+BBCLASSEXTEND = "native nativesdk"

recipes-python/pyqt6/python3-pyqt6_6.6.1.bb

@@ -0,0 +1,102 @@
+SUMMARY = "Python Qt6 Bindings"
+HOMEPAGE = "https://www.riverbankcomputing.com/software/pyqt"
+SECTION = "devel/python"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
+
+inherit pypi python3targetconfig python3-dir qt6-qmake qt6-paths
+
+PYPI_PACKAGE = "PyQt6"
+
+SRC_URI[sha256sum] = "9f158aa29d205142c56f0f35d07784b8df0be28378d20a97bcda8bd64ffd0379"
+
+S = "${WORKDIR}/PyQt6-${PV}"
+B = "${S}/build"
+
+DEPENDS += " \
+    qtbase \
+    qtdeclarative \
+    sip (>= 6.7.12) \
+    sip-native (>= 6.7.12) \
+    python3 \
+    python3-pyqt6-sip-native \
+    python3-pyqt6-sip \
+    python3-packaging-native \
+    python3-tomli-native \
+    python3-pyqt-builder-native \
+    python3-ply \
+    python3-ply-native \
+"
+
+RDEPENDS:${PN} += " \
+    qtbase \
+    qtdeclarative \
+    python3-core \
+    python3-pyqt6-sip \
+"
+
+# Disable support of 128bit ints and add path to Python.h
+CXXFLAGS += " -DQT_NO_INT128 -I${PYTHON_INCLUDE_DIR}"
+
+EXTRA_OEMAKE = "INSTALL_ROOT=${D}"
+
+DISABLED_FEATURES = " \
+    PyQt_Desktop_OpenGL \
+    PyQt_Accessibility \
+    PyQt_SessionManager \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '', 'PyQt_OpenGL', d)} \
+"
+
+PYQT_MODULES = " \
+    QtCore \
+    QtGui \
+    QtNetwork \
+    QtXml \
+    QtNetwork \
+    QtQml \
+    QtSql \
+"
+
+do_configure() {
+    local i
+    local extra_args
+
+    for i in ${DISABLED_FEATURES}; do
+        extra_args="${extra_args} --disabled-feature=${i}"
+    done
+
+    for i in ${PYQT_MODULES}; do
+        extra_args="${extra_args} --enable=${i}"
+    done
+
+    cd ${S}
+    sip-build \
+        --verbose \
+        --confirm-license \
+        --scripts-dir="${bindir}" \
+        --build-dir="${B}" \
+        --target-dir="${PYTHON_SITEPACKAGES_DIR}" \
+        --no-make \
+        --qmake=${OE_QMAKE_QMAKE} \
+        --pep484-pyi \
+        --no-dbus-python \
+        ${extra_args}
+
+    QMAKE_PROFILES=${B}/PyQt6.pro
+}
+
+do_compile:append() {
+    sed -i "s,${STAGING_DIR_TARGET},," ${B}/inventory.txt
+}
+
+do_install:append() {
+    sed -i "s,exec .*nativepython3,exec ${bindir}/python3," ${D}/${bindir}/*
+}
+
+# fix buildpaths warnings
+pyqt_fix_sources() {
+    find ${PKGD}/usr/src/debug/${PN} -type f -exec sed -i "s,\(${B}\|${S}\),/usr/src/debug/${PN}/${PV}-${PR},g" {} \;
+}
+PACKAGESPLITFUNCS:prepend = "pyqt_fix_sources"
+
+FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR} ${OE_QMAKE_PATH_PLUGINS}"

recipes-python/pyside6/python3-pyside6.inc

@@ -0,0 +1,32 @@
+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 'clang-layer' not in d.getVar('BBFILE_COLLECTIONS').split():
+        raise bb.parse.SkipRecipe('Requires meta-clang to be present.')
+}
+
+inherit setuptools3
+inherit qt6-cmake
+
+require recipes-qt/qt6/qt6-git.inc
+
+QT_GIT_PROJECT = "pyside"
+QT_MODULE = "pyside-setup"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/pyside6:"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE += "-DBUILD_TESTS=FALSE"
+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,61 @@
+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++"
+
+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('HOST_CC_ARCH').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,9 @@
+require python3-pyside6.inc
+
+DEPENDS += "qtbase clang-native python3-shiboken6-native"
+
+OECMAKE_SOURCEPATH = "${S}/sources/shiboken6"
+
+EXTRA_OECMAKE += "-DSHIBOKEN_BUILD_LIBS=ON"
+
+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-addons.bb

@@ -11,8 +11,8 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 RDEPENDS:${PN} += " \
     nativesdk-qtapplicationmanager-dev \
     nativesdk-qtapplicationmanager-tools \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'nativesdk-qtgrpc-dev', '', d)} \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'nativesdk-qtgrpc-tools', '', d)} \
+    nativesdk-qtgrpc-dev \
+    nativesdk-qtgrpc-tools \
     nativesdk-qtquick3d-dev \
     nativesdk-qtquick3d-tools \
     nativesdk-qtremoteobjects-dev \
@@ -28,6 +28,6 @@ RDEPENDS:${PN} += " \
 
 FORLINUXHOST:mingw32 = ""
 FORLINUXHOST = " \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'nativesdk-qtinterfaceframework-dev nativesdk-qtinterfaceframework-tools', '', d)} \
+    nativesdk-qtinterfaceframework-dev nativesdk-qtinterfaceframework-tools \
 "
 

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

@@ -1,6 +1,9 @@
 DESCRIPTION = "Qt6 development host commercial packages"
 LICENSE = "MIT"
 
+# disable sanity check for allarch packagegroup
+PACKAGE_ARCH = ""
+
 inherit packagegroup nativesdk
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"

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"
@@ -18,5 +21,5 @@ FORLINUXHOST = " \
     nativesdk-cmake \
     nativesdk-ninja \
     nativesdk-perl-modules \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'nativesdk-python3-html5lib', '', d)} \
+    nativesdk-python3-html5lib \
 "

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

@@ -16,11 +16,11 @@ RDEPENDS:${PN} += " \
     qtconnectivity \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdatavis3d', '', d)} \
     qtdeviceutilities \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtgraphs', '', d)} \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'qtgrpc', '', d)} \
+    qtgraphs \
+    qtgrpc \
     qthttpserver \
     qtimageformats \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'qtinterfaceframework', '', d)} \
+    qtinterfaceframework \
     qtlocation \
     qtlottie \
     qtmqtt \
@@ -47,13 +47,22 @@ 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)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
+"
+RDEPENDS:${PN}:append:arm = " qtquick3dphysics"
+RDEPENDS:${PN}:append:armv6 = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
+"
+RDEPENDS:${PN}:append:armv7a = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
+"
+RDEPENDS:${PN}:append:armv7ve = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
+"
+RDEPENDS:${PN}:append:x86 = " qtquick3dphysics"
+RDEPENDS:${PN}:append:x86-64 = "\
+    qtquick3dphysics \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', 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/ptest/run-ptest

@@ -1,5 +1,16 @@
 #!/bin/sh
 
+if [ ! -s tst_list ]; then
+    echo PASS: no tests
+    exit 0
+fi
+
+export LANG=C.UTF-8
+export QT_QPA_PLATFORM=offscreen
 for test in $(cat tst_list); do
-    ( cd $(dirname ${test}) && ./$(basename ${test}) )
+    (
+    cd $(dirname ${test})
+    t=$(basename ${test})
+    ./${t} && echo PASS: ${t} || echo FAIL: ${t}
+    )
 done

recipes-qt/qt6/qmlcompilerplus_git.bb

@@ -11,6 +11,4 @@ include recipes-qt/qt6/qt6-commercial.inc
 
 DEPENDS += "qtbase qtdeclarative qtdeclarative-native qmlcompilerplus-native"
 
-PTEST_ENABLED = "0"
-
 BBCLASSEXTEND = "native nativesdk"

recipes-qt/qt6/qt3d/0001-Use-unqualified-uint32_t-everywhere-in-FBXBinaryToke.patch

@@ -1,27 +0,0 @@
-From 6e377e36c9cab72b858f4149aed88e2090d9ff4d Mon Sep 17 00:00:00 2001
-From: Ville Voutilainen <ville.voutilainen@gmail.com>
-Date: Tue, 9 Aug 2022 01:51:30 +0300
-Subject: [PATCH] Use unqualified uint32_t everywhere in FBXBinaryTokenizer
-
-The use of qualified std::uint32_t requires including <cstdint> instead
-of <stdint.h> on some implementations, and that breaks the build of Qt 6
-on GCC 13. Just use the unqualified name everywhere.
----
-Upstream-Status: Backport [v5.2.5 commit 253f8bfa621a9fa6cd2c36291cdaa8c60c99322c]
-
- code/AssetLib/FBX/FBXBinaryTokenizer.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
-index 348812054..120e47a76 100644
---- a/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
-+++ b/code/AssetLib/FBX/FBXBinaryTokenizer.cpp
-@@ -472,7 +472,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length)
-     }
-     catch (const DeadlyImportError& e)
-     {
--        if (!is64bits && (length > std::numeric_limits<std::uint32_t>::max())) {
-+        if (!is64bits && (length > std::numeric_limits<uint32_t>::max())) {
-             throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", ai_to_string(version), ") of the FBX format. (", e.what(), ")");
-         }
-         throw;

recipes-qt/qt6/qt3d_git.bb

@@ -25,7 +25,6 @@ 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 \
-    file://0001-Use-unqualified-uint32_t-everywhere-in-FBXBinaryToke.patch;patchdir=src/3rdparty/assimp/src \
 "
 
 DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtshadertools qtshadertools-native"

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.6"
 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 = "a851849f3e58545b93041529565bf147e2ff605e"
-SRCREV_tqtc-qtinsighttracker = "0698ff767f02be2d81f1d1e35b4b9a2d13f36c4b"
-SRCREV_tqtc-qtvncserver = "8f0d24d3ebe7907b382cee9f31e8bea62d0546a2"
-SRCREV_qt3d = "920382c85c7933d0ca8f1cffb81aaaa17af2560d"
-SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
-SRCREV_qt5compat = "b53f53763d0aee4ed453a5b427ae24e7dda6308e"
-SRCREV_qtbase = "44cfdfa7c07a4f1aa1e5b6a384418556e6b3028e"
-SRCREV_qtapplicationmanager = "2cdef073adc592ead91e3357648dfa8ca5f0483c"
-SRCREV_qtcharts = "ce064aa8a6d5333de09f13a4ddf55132aaa92557"
-SRCREV_qtcoap = "a55bff01011325251ff455024b2684de53464943"
-SRCREV_qtconnectivity = "f92df5f13df75da35f537ba8920f3069de4b72a9"
-SRCREV_qtdatavis3d = "09b0b45ab88733365fa30c16288d7faffcc4d359"
-SRCREV_qtdeclarative = "b982c2146cd729e8dbfc41c33b3022b6ef702e94"
-SRCREV_qtdeviceutilities = "03693a1e230a13302932218ba0fcd7acaaa5cd98"
-SRCREV_qtgraphs = "ef3dcf12853f838ccea3834f6f4ea0d56bf1f1ab"
-SRCREV_qtgrpc = "8c1a9a50190b3845da1c444535817123b24dd3c4"
-SRCREV_qthttpserver = "eb71e1bc7bdf874e3349d73cfba32fdda6c6d94f"
-SRCREV_qtimageformats = "29a949b133e98ed9f58511164149403edccce7c6"
-SRCREV_qtinterfaceframework = "cf27ef87b609e1a14d223e4cfaefde3a0ce3c097"
-SRCREV_qtlanguageserver = "756d85baaab4f8a33a81913a4e971fae235dcdf7"
-SRCREV_qtlocation = "181834612d7fad00b1de1b2b6d505a435b271e26"
-SRCREV_qtlottie = "ce4f32538f24772b718f2b334769250aa24c8e53"
-SRCREV_qtmqtt = "e2f58cee5c316d92d2b3b824867af8a7c1094b79"
-SRCREV_qtmultimedia = "ec1747b0d18718649b1d6fd8581b55d5012a9c87"
-SRCREV_qtnetworkauth = "75a8a8eb81865cceea52121744d5cb150dedf82a"
-SRCREV_qtopcua = "97864141a3871b9649ac0b670337dcc0c5867cdb"
-SRCREV_qtpositioning = "fec9b22d86981008c7217bd14ef1241b9983c677"
-SRCREV_qtquick3d = "8f92f961b705a6e457c12cd158693818bb052133"
+SRCREV_tqtc-qmlcompilerplus = "976dae30ade4b2e766e91861047c4971237a93d5"
+SRCREV_tqtc-qtinsighttracker = "b1a9b31f0cf2a4eebdd372564be371b790fa190d"
+SRCREV_tqtc-qtvncserver = "108f7ba06f92e729a6cc2b9d6b454a89258af0ef"
+SRCREV_pyside-setup = "afbd87359bc5e959bac28cc0318794aa2231a91c"
+SRCREV_qt3d = "c5d6c942098327226ff0661b60adb3baef704992"
+SRCREV_qt3d-assimp = "c60a259fd35f09b8896b2920d48c436145914aae"
+SRCREV_qt5compat = "b495ada5f1eefc060f38a100b04ebc4c55abf076"
+SRCREV_qtbase = "afdec885058c92e24604f398a926297222da06f3"
+SRCREV_qtapplicationmanager = "8eeb7df697cae07b1636142e3d96b6aef6845098"
+SRCREV_qtcharts = "0891236aec710abe7b02166068ac5d0447d5c04c"
+SRCREV_qtcoap = "cb94031f00b0cbe3f2d7cb7c4322c57f11d37969"
+SRCREV_qtconnectivity = "bc8194177c9f11e0082650d83e2b452446d49b7c"
+SRCREV_qtdatavis3d = "263fce9ec8be74eeb7a67a9f87069ba3bdec60ed"
+SRCREV_qtdeclarative = "ab5521fd1a637739c7e91def84caa84426055aff"
+SRCREV_qtdeviceutilities = "45f8475ce8a1af3d122810c5ba19cdaf8f8aec67"
+SRCREV_qtgraphs = "398e5bf3d5c1b62d2ac4e50fb87bb9eb9c877645"
+SRCREV_qtgrpc = "fea34fc3596c90f53a70d51a50feee6bc6921689"
+SRCREV_qthttpserver = "19d4435d4ef523f4a5c30c6484a2f11739fc3fec"
+SRCREV_qtimageformats = "2bb23118cf14d96c1dbcb5da3f8b0cab3dfe3da2"
+SRCREV_qtinterfaceframework = "0455bf81a5777bf19894a2dc917b20df98d2ed0c"
+SRCREV_qtlanguageserver = "7a6eefecb4834c0b1238e7c5696d66227423747e"
+SRCREV_qtlocation = "0bb0e7bab232ba0832619ff3397040d25677b0f5"
+SRCREV_qtlottie = "f8a0df02d394e0a7bf06620da79f22c164e40c30"
+SRCREV_qtmqtt = "73fb20a86c607ed4c963ea056ffe7f882d6e894b"
+SRCREV_qtmultimedia = "42c108aba3bd007e0cfe349851575d3a333106a7"
+SRCREV_qtnetworkauth = "55af7eba57ac8c786290f88046da5a6b59b856ec"
+SRCREV_qtopcua = "13c80698da9a9b97d0f62d9072c44ccf585179ad"
+SRCREV_qtpositioning = "31cc09838d78da554afea162ea5a94bb45e489c6"
+SRCREV_qtquick3d = "94144b1fd579627b8f96116e6af362fc43e0ba85"
 SRCREV_qtquick3d-assimp = "c300c2c8e32cb9125d7caf0342b83d79e4925acd"
-SRCREV_qtquick3dphysics = "d689345cabe9205daff6ff1405d10fc4ef523c9e"
-SRCREV_qtquickdesigner-components = "e0198ba7bc8c9c7c9f1aadee3a35d7e0efbf4856"
-SRCREV_qtquicktimeline = "f88a21433614fc12c881d963aec664bcfdf5f8c2"
-SRCREV_qtremoteobjects = "1d1d9925a76beb3b86b0de2386635c8b77a45bc5"
-SRCREV_qtscxml = "7f4d742224d69edb823a2cf69fe0a67aec7361fd"
-SRCREV_qtsensors = "97a36e0ca9cf0305220ce5b47d8d2340ace05cc4"
-SRCREV_qtserialbus = "93c3e33897293bf64d145c5d8ab16e20df21209f"
-SRCREV_qtserialport = "3b407d359d46c6510e07d568b4c227155c5cf2b3"
-SRCREV_qtshadertools = "d6f53b3da241a9bdccb8ea07160c760ca4a2fa84"
-SRCREV_qtspeech = "747d2cc1a15ffcbb3743b77f8f9ba71d1feceb95"
-SRCREV_qtsvg = "e35ae8ce98053079331902e648e6ade1efff6e04"
-SRCREV_qttools = "3182e4ac04fc1e55a0ee5bf767863e4df95a1dcb"
+SRCREV_qtquick3dphysics = "007b89ee9b505428224a0178a443d0bdba6b20fe"
+SRCREV_qtquickdesigner-components = "8be09977abbdb638bf483ea417b36091b409c54f"
+SRCREV_qtquicktimeline = "e155cafc4e19fd4999779b14e906ac6403491159"
+SRCREV_qtremoteobjects = "d00a983aee9e30a1f0bc8c4e5873a3206857cb54"
+SRCREV_qtscxml = "7c3716741e93c0ab8ca3fe411f77bf6f3f52aef2"
+SRCREV_qtsensors = "fac467e1f18318581abe218dcf2b5d2f1deb7a45"
+SRCREV_qtserialbus = "1df01219add4b862a132b18fce2452143e44228f"
+SRCREV_qtserialport = "477a3b977154284ecad6ea9b68b62bf54b04bc89"
+SRCREV_qtshadertools = "58c70c631af3372ed20e042cf41159c6b754df06"
+SRCREV_qtspeech = "38451e6998bbeeb753f8a951e11bfbae32d20aa2"
+SRCREV_qtsvg = "86b5372ebf311b7a6411666c17c9f45e072c4b6f"
+SRCREV_qttools = "ad230559fb2fa2ae121552314206a926280d10a2"
 SRCREV_qttools-qlitehtml = "f05f78ef33225823d348ee18f2fa464e95024dd2"
 SRCREV_qttools-qlitehtml-litehtml = "43af58e8adad70c4f1a0a9235546a246754c1737"
-SRCREV_qttranslations = "9e3669e3370b2efd088aa7d771721557f3e69aa7"
-SRCREV_qtvirtualkeyboard = "ac0936917b88e10c9c6d2a26e2ed1f3e0b874a5b"
-SRCREV_qtwayland = "e1c1e58baf3ac4e866c90eab9963b6efc397fe65"
-SRCREV_qtwebchannel = "c3188853c8ee5253619b0615f74952349180381b"
-SRCREV_qtwebengine = "c4bc5914c27d7097bef44f4e987b2c5e4e03cd1e"
-SRCREV_qtwebengine-chromium = "34482ee5da826627131767d907800f6f4a2f0a36"
-SRCREV_qtwebsockets = "f9e3cb1e44ab4dc8a8d4cc751cb3604ee033931c"
-SRCREV_qtwebview = "aa3788b056c0ec16e93a135ed3d446ff95bab6c6"
+SRCREV_qttranslations = "5007f966daac7e132a8e158c874281730e67ebeb"
+SRCREV_qtvirtualkeyboard = "8a8fbb8888e04322909658a1328f20dec0f3c94c"
+SRCREV_qtwayland = "c48bc5a760fcf3311998297efb02e5c4bdfde70f"
+SRCREV_qtwebchannel = "a836e598960cd61e256e077c331b38bca662b77d"
+SRCREV_qtwebengine = "ee8f63ea4b325404529f231273adf1fb6eb874d1"
+SRCREV_qtwebengine-chromium = "34ec0d3e7bacfea89889641a8f4320d8ffcfa9af"
+SRCREV_qtwebsockets = "26db5812958bc8bcf6e333357760c3023631eae3"
+SRCREV_qtwebview = "2ba692f13a218edd824ae6307791faeb24c5a48b"

recipes-qt/qt6/qt6-ptest.inc

@@ -10,66 +10,88 @@ DEBUG_PREFIX_MAP += "\
  -fmacro-prefix-map=${D}= \
 "
 
+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,"
@@ -127,3 +125,4 @@ FILES:${PN}-examples = " \
     ${QT6_INSTALL_EXAMPLESDIR} \
     ${prefix}/examples \
 "
+RDEPENDS:${PN}-examples = "${PN}"

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

@@ -34,10 +34,10 @@ DEPENDS:remove:class-native = "qtbase-native"
 RDEPENDS_${PN}:remove:class-native = "libssl-native"
 
 RRECOMMENDS:${PN}:append:class-target = " locale-base-c"
+RRECOMMENDS:${PN}-ptest:append = " tzdata"
 
 PACKAGECONFIG:class-native ?= "\
-    gui widgets jpeg png dbus no-opengl openssl zlib \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'zstd', '', d)} \
+    gui widgets jpeg png dbus no-opengl openssl zlib zstd \
 "
 PACKAGECONFIG:class-nativesdk ?= "${PACKAGECONFIG:class-native}"
 PACKAGECONFIG ?= "\
@@ -78,8 +78,8 @@ PACKAGECONFIG_DEFAULT ?= "\
     widgets \
     xkbcommon \
     zlib \
+    zstd \
     ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'zstd', '', d)} \
 "
 
 PACKAGECONFIG:remove:mingw32 = "openssl"
@@ -93,6 +93,9 @@ 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"
@@ -114,13 +117,14 @@ PACKAGECONFIG[lttng] = "-DFEATURE_lttng=ON,-DFEATURE_lttng=OFF,lttng-ust"
 
 # gui
 PACKAGECONFIG[gui] = "-DFEATURE_gui=ON,-DFEATURE_gui=OFF"
-PACKAGECONFIG[accessibility] = "-DFEATURE_accessibility=ON,-DFEATURE_accessibility=OFF"
+PACKAGECONFIG[accessibility] = "-DFEATURE_accessibility=ON,-DFEATURE_accessibility=OFF,${ACCESSIBILITY_DEPENDS}"
 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-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"
@@ -128,7 +132,7 @@ 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[xcb] = "-DFEATURE_xcb=ON,-DFEATURE_xcb=OFF,libxcb xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil xcb-util-cursor"
@@ -159,6 +163,7 @@ EXTRA_OECMAKE += "\
 
 EXTRA_OECMAKE:append:class-target = "\
     -DFEATURE_rpath=OFF \
+    -DFEATURE_relocatable=OFF \
     -DQT_QPA_DEFAULT_PLATFORM=${QT_QPA_DEFAULT_PLATFORM} \
 "
 
@@ -206,7 +211,7 @@ EOF
 
 do_install:append:class-target() {
     sed >> ${D}${QT6_INSTALL_MKSPECSDIR}/linux-oe-g++/qmake.conf <<EOF \
-        -e 's:${lcl_maybe_fortify}::' \
+        -e 's: ${lcl_maybe_fortify}: :' \
         -e 's:${DEBUG_PREFIX_MAP}::' \
         -e 's:${RECIPE_SYSROOT}:$$[QT_SYSROOT]:' \
         -e 's:${TARGET_PREFIX}:$$[QT_HOST_PREFIX]${bindir}/${TARGET_SYS}/${TARGET_PREFIX}:'

recipes-qt/qt6/qtconnectivity_git.bb

@@ -14,9 +14,6 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-# QTBUG-93565
-PTEST_ENABLED = "0"
-
 DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
 
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"

recipes-qt/qt6/qtdeclarative_git.bb

@@ -17,5 +17,7 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native qtlanguageserver"
 
+PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtsvg"
+
 BBCLASSEXTEND = "native nativesdk"
 

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

@@ -13,11 +13,6 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-python() {
-    if 'meta-python' not in d.getVar('BBFILE_COLLECTIONS').split():
-        raise bb.parse.SkipRecipe('Requires meta-python to be present.')
-}
-
 # Default build and package these
 REFERENCE_API ?= "1"
 SIMULATION_SUPPORT ?= "1"

recipes-qt/qt6/qtmultimedia_git.bb

@@ -20,7 +20,10 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtshadertools qtshadertools-native"
 
-PACKAGECONFIG ?= "ffmpeg gstreamer pulseaudio qml spatialaudio spatialaudio_quick3d"
+PACKAGECONFIG ?= "\
+    ${@bb.utils.contains_any('LICENSE_FLAGS_ACCEPTED','commercial commercial_ffmpeg','ffmpeg','',d)} \
+    gstreamer pulseaudio qml spatialaudio spatialaudio_quick3d"
+
 PACKAGECONFIG[alsa] = "-DFEATURE_alsa=ON,-DFEATURE_alsa=OFF,alsa-lib"
 PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtsvg"
 PACKAGECONFIG[ffmpeg] = "-DFEATURE_ffmpeg=ON,-DFEATURE_ffmpeg=OFF,ffmpeg"

recipes-qt/qt6/qtquick3d/0001-Skip-embree-on-mingw.patch

@@ -5,6 +5,8 @@ Subject: [PATCH] Skip embree on mingw
 
 Build fails with older mingw headers, skip it complete since
 it's not needed for the toolchain.
+
+Upstream-Status: Inappropriate [OE Specific]
 ---
  src/3rdparty/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

recipes-qt/qt6/qtserialbus_git.bb

@@ -16,9 +16,7 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-PACKAGECONFIG ?= "modbus-serialport \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'socketcan', '', d)} \
-"
+PACKAGECONFIG ?= "modbus-serialport socketcan"
 PACKAGECONFIG:class-native = ""
 PACKAGECONFIG:class-nativesdk = ""
 

recipes-qt/qt6/qtshadertools_git.bb

@@ -16,6 +16,10 @@ include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS = "qtbase qtshadertools-native"
+DEPENDS:append:class-native = " spirv-tools-native"
+
+RDEPENDS:${PN}-tools = "spirv-tools"
+RDEPENDS:${PN}-tools:remove:mingw32 = "spirv-tools"
 
 BBCLASSEXTEND = "native nativesdk"
 

recipes-qt/qt6/qttools_git.bb

@@ -24,6 +24,12 @@ 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"
 
 BBCLASSEXTEND = "native nativesdk"

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

@@ -4,7 +4,7 @@ Date: Wed, 29 Jan 2020 12:39:09 +0200
 Subject: [PATCH] Allow qtwaylandscanner to be built without dependencies
 
 Change-Id: I15aa5fc5128fcd0925d5950596bd56710b5b81d4
-
+Upstream-Status: Inappropriate [OE Specific]
 ---
  CMakeLists.txt     | 5 -----
  src/CMakeLists.txt | 2 +-

recipes-qt/qt6/qtwebengine.inc

@@ -23,7 +23,7 @@ def gettext_oeconf(d):
     return ""
 
 QT_MODULE = "qtwebengine"
-QT_MODULE_BRANCH_CHROMIUM = "108-based"
+QT_MODULE_BRANCH_CHROMIUM = "112-based"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/qtwebengine:"
 
@@ -35,7 +35,5 @@ SRC_URI += " \
 
 SRC_URI += " \
     file://chromium/0001-v8-qemu-wrapper.patch;patchdir=src/3rdparty \
-    file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.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 c480cd09ed0297975f533c538faf26c7d4fcbe48 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
@@ -16,10 +16,10 @@ Change-Id: I217c9122144f25bb2d28717e7248c2a51b149127
  2 files changed, 6 insertions(+), 8 deletions(-)
 
 diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
-index b460dbbe8..98db2e52e 100644
+index 3371e5ff5..ac889d3f7 100644
 --- a/cmake/Functions.cmake
 +++ b/cmake/Functions.cmake
-@@ -819,7 +819,7 @@ endfunction()
+@@ -825,7 +825,7 @@ endfunction()
  
  macro(create_pkg_config_host_wrapper buildDir)
      find_package(PkgConfigHost)
@@ -28,9 +28,9 @@ index b460dbbe8..98db2e52e 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()
-@@ -1055,15 +1055,13 @@ endmacro()
- macro(append_toolchain_setup)
-     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"
@@ -38,7 +38,6 @@ index b460dbbe8..98db2e52e 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"
@@ -49,10 +48,10 @@ index b460dbbe8..98db2e52e 100644
              list(APPEND gnArgArg host_cpu="${cpu}")
          endif()
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index a62252783..3b7e4975f 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/0002-Enable-examples.patch

@@ -6,6 +6,7 @@ Subject: [PATCH] Enable examples
 The bug mentioned does not affect bitbake builds.
 
 Change-Id: I076763d9241061f9cdb4d46bcd88e46bd4f783aa
+Upstream-Status: Inappropriate [OE Specific]
 ---
  examples/CMakeLists.txt | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

recipes-qt/qt6/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch

@@ -1,42 +0,0 @@
-From 358e7b51c205521dc9eac8a8cf676412078fe014 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Thu, 30 Mar 2017 11:37:24 +0300
-Subject: [PATCH] chromium: workaround for too long .rps file name
-
-Ninja may fail when the build directory is too long:
-
-ninja: error: WriteFile(__third_party_WebKit_Source_bindings_modules_\
-interfaces_info_individual_modules__home_qt_work_build_build-nitrogen\
-6x_tmp_work_cortexa9hf-neon-mx6qdl-poky-linux-gnueabi_qtwebengine_5.9\
-.0_gitAUTOINC_29afdb0a34_049134677a-r0_build_src_toolchain_target__ru\
-le.rsp): Unable to create file. File name too long
-
-Task-number: QTBUG-59769
-Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1
----
- gn/src/gn/ninja_action_target_writer.cc | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/gn/src/gn/ninja_action_target_writer.cc b/gn/src/gn/ninja_action_target_writer.cc
-index 2ceac904a3c..8496e309cec 100644
---- a/gn/src/gn/ninja_action_target_writer.cc
-+++ b/gn/src/gn/ninja_action_target_writer.cc
-@@ -122,9 +122,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
-     // strictly necessary for regular one-shot actions, but it's easier to
-     // just always define unique_name.
-     std::string rspfile = custom_rule_name;
-+
-+    //quick workaround if filename length > 255 - ".rsp", just cut the dirs starting from the end
-+    //please note ".$unique_name" is not used at the moment
-+    int pos = 0;
-+    std::string delimiter("_");
-+    while (rspfile.length() > 250 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos)
-+        rspfile = rspfile.substr(0,pos);
-+
-     if (!target_->sources().empty())
-       rspfile += ".$unique_name";
-     rspfile += ".rsp";
-+
-     out_ << "  rspfile = " << rspfile << std::endl;
- 
-     // Response file contents.

recipes-qt/qt6/qtwebengine_git.bb

@@ -26,25 +26,22 @@ SECURITY_STRINGFORMAT = ""
 
 PACKAGECONFIG ??= "\
     ${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \
+    geolocation \
     glib \
+    lcms2 \
     libevent \
     libjpeg \
     libpci \
     libpng \
     libwebp \
-    zlib \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', '${PACKAGECONFIG_OPENEMBEDDED}', '', d)} \
-    geolocation \
-    webchannel \
-    printing-and-pdf \
-    pepper-plugins \
-    spellchecker \
-"
-PACKAGECONFIG_OPENEMBEDDED ?= "\
-    lcms2 \
     opus \
+    pepper-plugins \
+    printing-and-pdf \
     snappy \
+    spellchecker \
+    webchannel \
     webrtc \
+    zlib \
 "
 
 PACKAGECONFIG[alsa] = "-DFEATURE_webengine_system_alsa=ON,-DFEATURE_webengine_system_alsa=OFF,alsa-lib"
@@ -86,8 +83,6 @@ FILES:${PN}-tools = ""
 # when proprietary-codecs is enabled
 INSANE_SKIP:${PN} += "textrel"
 
-QT_PTEST_ENABLED = "0"
-
 # QTBUG-109565 workaround: Disable GCC -O2 on armv7a-neon due to stack alignment issue
 FULL_OPTIMIZATION:remove:armv7a = "${@bb.utils.contains('TUNE_FEATURES', 'neon', '-O2', '', d)}"
 FULL_OPTIMIZATION:append:armv7a = "${@bb.utils.contains('TUNE_FEATURES', 'neon', ' -O1', '', d)}"

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