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

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

README.md

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

classes/qt6-qmake.bbclass

@@ -12,13 +12,12 @@ OE_QMAKE_PATH_DOCS = "${QT6_INSTALL_DOCDIR}"
 OE_QMAKE_PATH_SETTINGS = "${sysconfdir}"
 OE_QMAKE_PATH_EXAMPLES = "${QT6_INSTALL_EXAMPLESDIR}"
 OE_QMAKE_PATH_TESTS = "${QT6_INSTALL_TESTSDIR}"
-OE_QMAKE_PATH_HOST_PREFIX = ""
-OE_QMAKE_PATH_HOST_PREFIX:class-target = "${STAGING_DIR_NATIVE}"
-OE_QMAKE_PATH_HOST_BINS = "${QT6_INSTALL_BINDIR}"
-OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}"
-OE_QMAKE_PATH_HOST_LIBS = "${STAGING_LIBDIR}"
-OE_QMAKE_PATH_HOST_LIBEXECS = "${QT6_INSTALL_LIBEXECDIR}"
-OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_HOST_BINS}"
+
+OE_QMAKE_PATH_HOST_PREFIX = "${STAGING_DIR_NATIVE}${prefix_native}"
+OE_QMAKE_PATH_HOST_BINS = "${@os.path.normpath(os.path.join(d.getVar('STAGING_BINDIR_NATIVE'),os.path.relpath(d.getVar('QT6_INSTALL_BINDIR'),d.getVar('bindir'))))}"
+OE_QMAKE_PATH_HOST_DATA = "${@os.path.normpath(os.path.join(d.getVar('STAGING_LIBDIR'),os.path.relpath(d.getVar('QT6_INSTALL_ARCHDATADIR'),d.getVar('libdir'))))}"
+OE_QMAKE_PATH_HOST_LIBS = "${@os.path.normpath(os.path.join(d.getVar('STAGING_LIBDIR_NATIVE'),os.path.relpath(d.getVar('QT6_INSTALL_LIBDIR'),d.getVar('libdir'))))}"
+OE_QMAKE_PATH_HOST_LIBEXECS = "${@os.path.normpath(os.path.join(d.getVar('STAGING_LIBEXECDIR_NATIVE'),os.path.relpath(d.getVar('QT6_INSTALL_LIBEXECDIR'),d.getVar('libexecdir'))))}"
 
 # This is useful for target recipes to reference native mkspecs
 QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}"
@@ -63,7 +62,7 @@ EXTRA_OEMAKE = " \
     OE_QMAKE_INCDIR_QT='${STAGING_DIR_TARGET}/${OE_QMAKE_PATH_HEADERS}' \
 "
 
-OE_QMAKE_QMAKE = "${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake"
+OE_QMAKE_QMAKE = "${OE_QMAKE_PATH_HOST_BINS}/qmake"
 export OE_QMAKE_CC = "${CC}"
 export OE_QMAKE_CFLAGS = "${CFLAGS}"
 export OE_QMAKE_CXX = "${CXX}"
@@ -80,40 +79,7 @@ export OE_QMAKE_QTCONF_PATH = "${WORKDIR}/qt.conf"
 
 inherit qt6-paths remove-libtool
 
-generate_target_qt_config_file() {
-    qtconf="$1"
-    cat > "$qtconf" <<EOF
-[Paths]
-Prefix = ${OE_QMAKE_PATH_PREFIX}
-Headers = ${OE_QMAKE_PATH_HEADERS}
-Libraries = ${OE_QMAKE_PATH_LIBS}
-ArchData = ${OE_QMAKE_PATH_ARCHDATA}
-Data = ${OE_QMAKE_PATH_DATA}
-Binaries = ${OE_QMAKE_PATH_BINS}
-LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}
-Plugins = ${OE_QMAKE_PATH_PLUGINS}
-QmlImports = ${OE_QMAKE_PATH_QML}
-Translations = ${OE_QMAKE_PATH_TRANSLATIONS}
-Documentation = ${OE_QMAKE_PATH_DOCS}
-Settings = ${OE_QMAKE_PATH_SETTINGS}
-Examples = ${OE_QMAKE_PATH_EXAMPLES}
-Tests = ${OE_QMAKE_PATH_TESTS}
-HostBinaries = ${OE_QMAKE_PATH_BINS}
-HostData = ${OE_QMAKE_PATH_ARCHDATA}
-HostLibraries = ${OE_QMAKE_PATH_LIBS}
-HostSpec = ${OE_QMAKE_PLATFORM}
-TargetSpec = ${OE_QMAKE_PLATFORM}
-ExternalHostBinaries = ${OE_QMAKE_PATH_BINS}
-Sysroot =
-EOF
-}
-
 do_generate_qt_config_file() {
-    generate_qt_config_file_paths
-    generate_qt_config_file_effective_paths
-}
-
-generate_qt_config_file_paths() {
     cat > ${OE_QMAKE_QTCONF_PATH} <<EOF
 [Paths]
 Prefix = ${OE_QMAKE_PATH_PREFIX}
@@ -130,28 +96,18 @@ Documentation = ${OE_QMAKE_PATH_DOCS}
 Settings = ${OE_QMAKE_PATH_SETTINGS}
 Examples = ${OE_QMAKE_PATH_EXAMPLES}
 Tests = ${OE_QMAKE_PATH_TESTS}
+HostPrefix = ${OE_QMAKE_PATH_HOST_PREFIX}
 HostBinaries = ${OE_QMAKE_PATH_HOST_BINS}
 HostData = ${OE_QMAKE_PATH_HOST_DATA}
 HostLibraries = ${OE_QMAKE_PATH_HOST_LIBS}
 HostLibraryExecutables = ${OE_QMAKE_PATH_HOST_LIBEXECS}
 HostSpec = ${OE_QMAKE_PLATFORM_NATIVE}
 TargetSpec = ${OE_QMAKE_PLATFORM}
-ExternalHostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}
 Sysroot = ${STAGING_DIR_TARGET}
 SysrootifyPrefix=true
 EOF
 }
 
-generate_qt_config_file_effective_paths() {
-    cat >> ${OE_QMAKE_QTCONF_PATH} <<EOF
-[EffectivePaths]
-HostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}
-HostLibraries = ${STAGING_LIBDIR_NATIVE}
-HostData = ${OE_QMAKE_PATH_HOST_DATA}
-HostPrefix = ${STAGING_DIR_NATIVE}
-HostLibraryExecutables = ${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_HOST_LIBEXECS}
-EOF
-}
 #
 # Allows to override following values (as in version 5.0.1)
 # Prefix The default prefix for all paths.
@@ -175,7 +131,6 @@ EOF
 # HostPrefix The prefix for host tools when cross compiling (building tools for both systems)
 # HostBinaries The location where to install host tools
 # HostData The location where to install host data
-# ExternalHostBinaries The location where we already have host tools (when cross compiling, but reusing existing tools)
 # TargetSpec The location where to install target mkspec
 # HostSpec The location where to install host mkspec
 

coin/module_config.yaml

@@ -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 kirkstone
   enable_if:
       condition: property
       property: target.arch

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"

coin/test-kirkstone.inc

@@ -0,0 +1 @@
+PACKAGECONFIG:remove:pn-qtbase = "sql-mysql"

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.10.0"
+QT_VERSION = "6.10.1"
 
 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"

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,34 @@
+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} \
+    -Dis_pyside6_superproject_build=ON \
+"
+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,74 @@
+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 qtwebview', '', 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 \
+    ${prefix}/PySide6/include \
+"
+
+SYSROOT_DIRS += "${prefix}/PySide6/include"

recipes-python/pyside6/python3-shiboken6_git.bb

@@ -0,0 +1,20 @@
+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}||'
+}
+
+FILES:${PN}-dev += "${prefix}/shiboken6/include"
+
+SYSROOT_DIRS += "${prefix}/shiboken6/include"
+
+BBCLASSEXTEND = "native nativesdk"

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

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

recipes-qt/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 \

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/qt6/qt3d_git.bb

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

recipes-qt/qt6/qt6-git.inc

@@ -4,69 +4,71 @@ HOMEPAGE ?= "https://www.qt.io"
 inherit srcrev-update
 
 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "dev"
+QT_MODULE_BRANCH ?= "6.10"
 QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
 QT_MODULE_REPO ?= "${QT_MODULE}.git"
 
-SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}"
+# for compatibility with Yocto releases before whinlatter
+BB_GIT_DEFAULT_DESTSUFFIX ?= "${BP}"
+
+SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}"
 
 CVE_PRODUCT ?= "qt:${BPN} qt:qt"
 
-S = "${WORKDIR}/git"
-
 PV = "${QT_VERSION}"
 
 SRCREV = "${SRCREV_${QT_MODULE}}"
 
-SRCREV_tqtc-qmlcompilerplus = "62f0cc04dc7d1da3707632fd240b0fca2aa33426"
-SRCREV_tqtc-qtinsighttracker = "64ac6017bc4e31f61d07501039cec0aaf6a17087"
-SRCREV_tqtc-qtvncserver = "b14bc481037187956fabf3ffe6a3aede5abc330b"
-SRCREV_qt3d = "315ed3c0904612743a7c5ee547800865ffd5e20b"
-SRCREV_qt3d-assimp = "647f94648c0ae24b9c6684383a9dbbc0e2fc23b7"
-SRCREV_qt5compat = "bd407c33e78d47eb2ffc2547f300e2ed9d4d997c"
-SRCREV_qtbase = "ccce91461a39adebde7ec7803b4cc0b97093f77f"
-SRCREV_qtapplicationmanager = "7144c68027dc113f389d73570bcdaeccaae7affd"
-SRCREV_qtcharts = "de85db072bd47f780d63d25b0113a03a10ec5ee1"
-SRCREV_qtcoap = "ce19f0a28ecb755267f601015d2a14b10cdace6f"
-SRCREV_qtconnectivity = "fa25e5809b9a55d2d2014753f1d2c5c3246b05ba"
-SRCREV_qtdatavis3d = "de145800f9a56d4bd1249eb6c4780d7b203c507c"
-SRCREV_qtdeclarative = "30d2b91fb48c2a28188f75d3e87311a2a6aba5d8"
-SRCREV_qtdeviceutilities = "8c689f05318a6d7b4bef80cdaf6038745d2357c6"
-SRCREV_qtdoc = "fa58cd1ab825316de312958d93cf4ce6d4558cf0"
-SRCREV_qtgraphs = "155b4547efea597777cc89ee353938237b7f036d"
-SRCREV_qtgrpc = "abbe99c0d05df122346f2f2452efa10bf840a90b"
-SRCREV_qthttpserver = "bd29a7f0f57c6738826419e88ce46faafd04f4dd"
-SRCREV_qtimageformats = "fa96798b387a6adbe4838eec05165645ccd8853d"
-SRCREV_qtinterfaceframework = "73efcbaf70e368c429278cc9fcc22326f9ca3269"
-SRCREV_qtlanguageserver = "b5d17027959532cbb0a78a9ebb1af1c566d451d9"
-SRCREV_qtlocation = "7a9598796d183acb0960a242fbae0231ced7055f"
-SRCREV_qtlottie = "d2436dcfe2dc8850775a92ac2cec76f57d3bc2d9"
-SRCREV_qtmqtt = "9c04ffb5c3fee0f30cee7ee7f691fba906615538"
-SRCREV_qtmultimedia = "e94cfbef6b1d9242ae8bc6ec860da7fd6dfe3834"
-SRCREV_qtnetworkauth = "e6c4d573e3adda8ea62dbdbc043f5c80ca96ebef"
-SRCREV_qtopcua = "061d7877406ae4420fba6aa6051b63043c3f0d7c"
-SRCREV_qtpositioning = "be4569c6e56969242c10ef2aefd035c7802b53a4"
-SRCREV_qtquick3d = "6476f23e274c3c3d8b41c9c7b73f50e254129c77"
-SRCREV_qtquick3d-assimp = "647f94648c0ae24b9c6684383a9dbbc0e2fc23b7"
-SRCREV_qtquick3dphysics = "0b3ffcc685f81f3d1714560a51e649e7fdeea58a"
+SRCREV_pyside-setup = "002e11d94aee1f3f799107815afa787b2d99e8b5"
+SRCREV_tqtc-qmlcompilerplus = "e5b5d66608e4416e473403e549eaad22561cf4ba"
+SRCREV_tqtc-qtinsighttracker = "f7aaad5ce6f64ed5b8038220a741ea094019db23"
+SRCREV_tqtc-qtvncserver = "dba9fa2cc498bfa439264b22994558b9d3ceb066"
+SRCREV_qt3d = "2472f07e08b5091b0f761f009403e8149a0efbf7"
+SRCREV_qt3d-assimp = "488a2f7af2920295ada886f113a0d563dab79b8d"
+SRCREV_qt5compat = "dbc825317c030701bc454bcb5c332aa13dcdaf94"
+SRCREV_qtbase = "90b845d15ffb97693dba527385db83510ebd121a"
+SRCREV_qtapplicationmanager = "c01e18498399c1869a4368d8e460b361c274e350"
+SRCREV_qtcharts = "5754032cf8bfcf16692f698c6349926ec0554ece"
+SRCREV_qtcoap = "b066ae97ac6c1a2d11e407a145fa0c83fd04b403"
+SRCREV_qtconnectivity = "b7339f4a744d7ac3a865f75001a38d96c2eb0547"
+SRCREV_qtdatavis3d = "f589de9689d195055adda46427fc1d0435927c82"
+SRCREV_qtdeclarative = "22fb5e739a2ea700448b22d34ade0d5c1927cb48"
+SRCREV_qtdeviceutilities = "928a10461cdc82364172196193159f3d4bfbc0e2"
+SRCREV_qtdoc = "52310ad96ec1a4d685e1216a71170bce90444379"
+SRCREV_qtgraphs = "b50b4e3b46940e5aa3cf31babb4ff1c9454ab473"
+SRCREV_qtgrpc = "4fb8bebd2cf4a82a3501bb303a5b666dd6f8dd4c"
+SRCREV_qthttpserver = "8dc17fd1270d367a10e1d69e561fba8797b896a9"
+SRCREV_qtimageformats = "f24f9588d904294b77368f5dab7114934f9336ae"
+SRCREV_qtinterfaceframework = "0fc91bc4b548becd80ff2dfd1858e7785d274c64"
+SRCREV_qtlanguageserver = "6fecea633d1a57f65f69b003cc4de5ff26ddd3db"
+SRCREV_qtlocation = "f9b4e48a1b8ba398b2a0393ec645662bacbb403b"
+SRCREV_qtlottie = "f5ccb0bd1f7287039f8500b50852a77aa74dbd63"
+SRCREV_qtmqtt = "ff285a85d0734ee3e28b609c90e6084471f5b11d"
+SRCREV_qtmultimedia = "685218d33d81de62e11328faabd060c4e634ddf0"
+SRCREV_qtnetworkauth = "4287152362078f54171d69e43d40ed523e80b869"
+SRCREV_qtopcua = "e758980bb527452feea6e6f5f0df64d4a7dffbe0"
+SRCREV_qtpositioning = "11d336c178adf4b8d8f7f8589bb9641bcf4b8eda"
+SRCREV_qtquick3d = "c145340b680366c9ecb7bedb3f24cfa7f0f16f80"
+SRCREV_qtquick3d-assimp = "488a2f7af2920295ada886f113a0d563dab79b8d"
+SRCREV_qtquick3dphysics = "33292b03560ceb18dedd19b6d50152c7251e01f4"
 SRCREV_qtquickdesigner-components = "8c9e0faa0dd8b8adf019e357212e59898a7bebfb"
-SRCREV_qtquicktimeline = "4aaad7c9320b6e2688fe7dd42ce179e90ba1cceb"
-SRCREV_qtremoteobjects = "9347765c55982794709db65c0f418b00acd5a500"
-SRCREV_qtscxml = "a24a44bf6fef3ef264840124cde82cbc1e567871"
-SRCREV_qtsensors = "c2bb52c3b1972e6fb2f8d2485a5a119fdffe03ad"
-SRCREV_qtserialbus = "efdbba55eb147e934b341df22e2bb78b3bb26095"
-SRCREV_qtserialport = "b26323144248ff40edd271c9c043baa25475d644"
-SRCREV_qtshadertools = "0c841bbdbfd00edfecfd5c3d8294ee3b2aef9f83"
-SRCREV_qtspeech = "08cddcb717d2d9a9780ebc4e2ea11f088ac175a6"
-SRCREV_qtsvg = "45d219f1f83b3a832d4f2829821144ea74a852f7"
-SRCREV_qttools = "059e2e42c8625aa9c5767627ebcbc0956d89ec01"
-SRCREV_qttools-qlitehtml = "2992a310640697325791a5494ca8f4d4552de368"
+SRCREV_qtquicktimeline = "1289642dc2f2ea0217b586c87e2a88ccc85ea8be"
+SRCREV_qtremoteobjects = "2a5279d42af99922b54cc342a90cfff8237b1c03"
+SRCREV_qtscxml = "55588762242ad9fdaca805f95537dfb2c4cf7615"
+SRCREV_qtsensors = "6cf07f0c526c17a18d1d23454b564e72cc0a501c"
+SRCREV_qtserialbus = "aeb9194a48f883bedabbe39514518d98d3993d20"
+SRCREV_qtserialport = "b2d8eade3a13aefd8aeae15f48f4afe9f97ba394"
+SRCREV_qtshadertools = "86c4b079a05c2dbe5fdb6f46ad9df8ef297487a9"
+SRCREV_qtspeech = "34650239df441c32b3a11762f522b6ff8b7e66e6"
+SRCREV_qtsvg = "4b1a183d3592f497bc3fd3a2c7130f228175b899"
+SRCREV_qttools = "9e0030f889168f7a0ec1bb47a7d7138a497b3c96"
+SRCREV_qttools-qlitehtml = "3fe5821dad98747d6e41c9ed54b86c3d0eee9daf"
 SRCREV_qttools-qlitehtml-litehtml = "6ca1ab0419e770e6d35a1ef690238773a1dafcee"
-SRCREV_qttranslations = "727eda4e2f24c257b91ddb8dca1820db4150992b"
-SRCREV_qtvirtualkeyboard = "e8238f568ef7e541fce492117da8876b2b34bf42"
-SRCREV_qtwayland = "85c978dd9acfa07ed7d83b90b92a9767ab81d775"
-SRCREV_qtwebchannel = "bed96d1977bb7da20a527b52b0e5c80be65e796f"
-SRCREV_qtwebengine = "7cbc1bc4b9ab2e09880633888eacbc146e16701a"
-SRCREV_qtwebengine-chromium = "45d204bccd41e0f9ec166e47e2a15714e26f384b"
-SRCREV_qtwebsockets = "7ac0388c474dae2aae4998d762feafc63fc4411d"
-SRCREV_qtwebview = "3b7ea7f2581c5fedfa44b7cc640ed37a5fd7e6cc"
+SRCREV_qttranslations = "0ef9d13d31a44a999281c589cff2b19979885176"
+SRCREV_qtvirtualkeyboard = "0218b3261fc03937f05881ece00783d207ce4481"
+SRCREV_qtwayland = "8368f75344ad0376f7656b4c18c87b0ebce2f3e1"
+SRCREV_qtwebchannel = "f6afc406450f66dc8f3edbd191638c54efe4bbcc"
+SRCREV_qtwebengine = "28eb5425c6abef3938fb82a48427d45d1dd4e64f"
+SRCREV_qtwebengine-chromium = "0bf5e1dca77ba817cd473449854920c1c9b7722c"
+SRCREV_qtwebsockets = "ba2ada87ef9027650efb6251e7fc05519f484e95"
+SRCREV_qtwebview = "86a71b5a88494368557d7c2c083287f15d5cd0e7"

recipes-qt/qt6/qt6-ptest.inc

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

recipes-qt/qt6/qt6.inc

@@ -85,9 +85,9 @@ FILES:${PN}-dev += " \
     ${QT6_INSTALL_LIBDIR}/*.prl \
     ${QT6_INSTALL_LIBDIR}/*.la \
     ${QT6_INSTALL_LIBDIR}/cmake \
-    ${QT6_INSTALL_LIBDIR}/metatypes \
+    ${QT6_INSTALL_ARCHDATADIR}/metatypes \
     ${QT6_INSTALL_LIBDIR}/pkgconfig \
-    ${QT6_INSTALL_LIBDIR}/sbom \
+    ${QT6_INSTALL_ARCHDATADIR}/sbom \
     ${QT6_INSTALL_MKSPECSDIR} \
     ${QT6_INSTALL_QMLDIR}/*.qmltypes \
     ${QT6_INSTALL_QMLDIR}/*/*.qmltypes \

recipes-qt/qt6/qtapplicationmanager_git.bb

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

recipes-qt/qt6/qtbase_git.bb

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

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

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

recipes-qt/qt6/qtgrpc_git.bb

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

recipes-qt/qt6/qtlanguageserver_git.bb

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

recipes-qt/qt6/qtlottie_git.bb

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

recipes-qt/qt6/qtpdf_git.bb

@@ -8,7 +8,7 @@ DEPENDS += " \
     bison-native \
     nss nss-native \
     qtbase qtdeclarative qtdeclarative-native \
-    gn-native \
+    qt-gn-native \
     libxkbcommon \
     python3-html5lib-native \
 "

recipes-qt/qt6/qtpositioning_git.bb

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

recipes-qt/qt6/qtquick3d_git.bb

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

recipes-qt/qt6/qttools_git.bb

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

recipes-qt/qt6/qtvirtualkeyboard_git.bb

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

recipes-qt/qt6/qtvncserver_git.bb

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

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

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

recipes-qt/qt6/qtwayland_git.bb

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

recipes-qt/qt6/qtwebchannel_git.bb

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

recipes-qt/qt6/qtwebengine.inc

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

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

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

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

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

recipes-qt/qt6/qtwebengine_git.bb

@@ -9,7 +9,7 @@ DEPENDS += " \
     qemu-native \
     nss nss-native \
     qtbase qtdeclarative qtdeclarative-native \
-    gn-native \
+    qt-gn-native \
     python3-html5lib-native \
 "
 

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.1.1.bb

@@ -0,0 +1,114 @@
+LICENSE = "The-Qt-Company-Commercial"
+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}-qt610x-linux64.run"
+
+SRC_URI = "\
+    ${SQUISH_MIRROR}/${PV}/${SQUISH_INSTALLER};name=squish \
+    ${SQUISH_MIRROR}/${PV}/squish-${PV}-qt-embedded-src.tar.gz;name=qt-squish-embedded;subdir=${BP};striplevel=1 \
+"
+
+SRC_URI[squish.sha256sum] = "88c19cb54c6447caad0c133927fae005c9c8c425d2643266f3ac8d6204226b6b"
+SRC_URI[qt-squish-embedded.sha256sum] = "897b184d1df549353995a284ffddf044ddd3c6f6a306546d61dc6a4db6fd5910"
+
+DEPENDS += "\
+    qtbase \
+    qt5compat \
+"
+
+PACKAGECONFIG ?= "\
+    appman \
+    qml \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \
+"
+PACKAGECONFIG[appman] = "--enable-qt-appman,--disable-qt-appman,qtapplicationmanager"
+PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
+PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,qtwayland 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
+    mkdir -p ${WORKDIR}/tmp
+    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"