Verify QT_VERSION

Add task to verify that QT_VERSION matches the version used in the Qt sources.

Pick-to: 6.11 6.10 6.8
Change-Id: I0065bf3bcda7174a337960f4ec1ac7c403599fcf
Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

README.md

@@ -7,10 +7,6 @@ URI: https://git.openembedded.org/openembedded-core/
 
 URI: https://git.openembedded.org/meta-openembedded/
 
-and optionally:
-
-URI: https://github.com/kraj/meta-clang
-
 Yocto version support
 ---------------------
 
@@ -20,23 +16,27 @@ that is `dev` for the development branch, `6.x` for minor stabilization branches
 
 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
+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 | 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 |
+| Yocto \ Qt | dev | 6.11 | 6.10 | 6.9  | 6.8 | 6.7 | 6.6 | 6.5 | 6.4 | 6.3 | 6.2 |
+|:---------- |:---:|:----:|:----:|:----:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
+| wrynose    |  x  |  x   |      |      |  x  |     |     |     |     |     |     |
+| whinlatter |  x  |  x   |  x   |  c   |  x  |     |     |     |     |     |     |
+| walnascar  |  x  |  x   |  x   |  c   |  x  |     |     |     |     |     |     |
+| styhead    |  c  |  c   |  c   |  c   |  c  |  c  |     |     |     |     |     |
+| scarthgap  |  x  |  x   |  x   |  c   |  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   |  c   |  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|stable|closed| 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
@@ -60,12 +60,6 @@ a commercial Qt license and you have set up SSH access to Qt Gerrit (see links b
 The commercial Qt modules are included in the build if the `QT_COMMERCIAL_MODULES`
 variable is set to `1` and you are using a commercial edition of Qt.
 
-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
 ------------
 

SECURITY.md

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

classes/populate_sdk_qt6_base.bbclass

@@ -1,5 +1,7 @@
 inherit qt6-paths
 
+SDKIMAGE_FEATURES:append = " staticdev-pkgs"
+
 SDK_POSTPROCESS_COMMAND:prepend = "create_qt6_sdk_files;"
 
 EXE_EXT = ""
@@ -25,7 +27,7 @@ create_qt6_sdk_files () {
     echo 'Binaries = ${QT6_INSTALL_BINDIR}' >> $qtconf
     echo 'LibraryExecutables = ${QT6_INSTALL_LIBEXECDIR}' >> $qtconf
     echo 'Plugins = ${QT6_INSTALL_PLUGINSDIR}' >> $qtconf
-    echo 'Qml2Imports = ${QT6_INSTALL_QMLDIR}' >> $qtconf
+    echo 'QmlImports = ${QT6_INSTALL_QMLDIR}' >> $qtconf
     echo 'Translations = ${QT6_INSTALL_TRANSLATIONSDIR}' >> $qtconf
     echo 'Documentation = ${QT6_INSTALL_DOCDIR}' >> $qtconf
     echo 'Settings = ${QT6_INSTALL_SYSCONFDIR}' >> $qtconf

classes/qt6-cmake.bbclass

@@ -9,9 +9,11 @@ EXTRA_OECMAKE += "\
     -DCMAKE_MESSAGE_LOG_LEVEL=${QT_MESSAGE_LOG_LEVEL} \
 "
 QT_FORCE_BUILD_TOOLS ?= "OFF"
+QT_INSTALL_EXAMPLES_SOURCES ?= "OFF"
 EXTRA_OECMAKE:append:class-target = "\
     -DQT_HOST_PATH:PATH=${RECIPE_SYSROOT_NATIVE}${prefix_native}/ \
     -DQT_FORCE_BUILD_TOOLS=${QT_FORCE_BUILD_TOOLS} \
+    -DQT_INSTALL_EXAMPLES_SOURCES=${QT_INSTALL_EXAMPLES_SOURCES} \
     -D__harfbuzz_broken_config_file=TRUE \
 "
 EXTRA_OECMAKE:append:class-nativesdk = "\
@@ -39,10 +41,21 @@ EXTRA_OECMAKE += "\
 
 do_install:append() {
     # Replace host paths with qmake built-in properties QTBUG-84725
+    # remove all references to TMPDIR that could not be replaced QTBUG-105877
     find ${D} \( -name "*.pri" -or -name "*.prl" \) -exec \
         sed -i -e 's|${STAGING_DIR_NATIVE}|$$[QT_HOST_PREFIX/get]|g' \
                -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \
-               -e '/QMAKE_PRL_BUILD_DIR/d' {} \;
+               -e '/QMAKE_PRL_BUILD_DIR/d' \
+               -e '\|${WORKDIR}|d' {} \;
+
+    # Remove buildpaths from SBOM files
+    # QTBUG-130557
+    if [ -e ${D}${QT6_INSTALL_LIBDIR}/sbom ]; then
+        sed -i ${D}${QT6_INSTALL_LIBDIR}/sbom/*.spdx \
+            -e 's|${STAGING_DIR_NATIVE}||' \
+            -e 's|${S}||g' \
+            -e 's|${B}||'
+    fi
 }
 
 export QT_DISABLE_SHADER_DISK_CACHE = "1"

classes/qt6-paths.bbclass

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

classes/qt6-qmake.bbclass

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

classes/srcrev-update.bbclass

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

classes/verify-qt-version.bbclass

@@ -0,0 +1,22 @@
+python do_verify_qt_version() {
+    import os, re
+
+    qt_version = d.getVar('QT_VERSION')
+
+    cmake_conf = os.path.join(d.getVar('S'), '.cmake.conf')
+    with open(cmake_conf, 'r', encoding='utf-8') as f:
+        data = f.read()
+
+    m = re.search(r'set\(QT_REPO_MODULE_VERSION "([0-9.]+)"\)', data)
+    if not m:
+        bb.fatal("Could not parse QT_REPO_MODULE_VERSION from %s" % cmake_conf)
+
+    repo_version = m.group(1)
+
+    if qt_version != repo_version:
+        bb.fatal("Qt version mismatch: QT_VERSION (%s) does not match the sources (%s)" \
+            % (qt_version, repo_version))
+}
+
+addtask verify_qt_version after do_patch before do_configure
+

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, INSIGNIFICANT_TARGET1]
+      in_values: [TARGET1, TARGET2, TARGET3, TARGET4, TARGET5, TARGET6, TARGET7]
 
 machine_type:
   Build:
@@ -15,13 +15,15 @@ machine_type:
 
 # Target build matrix:
 #
-#           [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] [target2]  [target3] [target4]  [target5] [target6] [target7]
+# [machine]   qemuarm64 qemux86-64 qemuarm   qemux86    qemuarm64 qemuarm64 qemuarm64
+# [yocto]     master    walnascar  scarthgap whinlatter scarthgap master    master
+# [wayland]   yes       no         yes       yes        yes       no        yes
+# [x11]       no        yes        yes       no         no        yes       yes
+# [opengl]    yes       yes        yes       yes        yes       no        yes
+# [mingw]     no        no         yes       no         no        no        no
+# [static]    no        no         no        no         yes       no        no
+# [toolchain] gcc       gcc        gcc       gcc        gcc       gcc       clang
 
 target1: &target1
   type: Group
@@ -34,7 +36,10 @@ target1: &target1
       variableValue: master.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs wayland
+      variableValue: ci configs wayland opengl
+    - type: EnvironmentVariable
+      variableName: CHECK_COMPATIBILITY
+      variableValue: 1
   enable_if:
       condition: property
       property: target.arch
@@ -47,10 +52,10 @@ target2: &target2
       variableValue: qemux86-64
     - type: EnvironmentVariable
       variableName: MANIFEST
-      variableValue: master.xml
+      variableValue: walnascar.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs
+      variableValue: ci configs x11 opengl
   enable_if:
       condition: property
       property: target.arch
@@ -63,10 +68,10 @@ target3: &target3
       variableValue: qemuarm
     - type: EnvironmentVariable
       variableName: MANIFEST
-      variableValue: dunfell.xml
+      variableValue: scarthgap.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs dunfell no-webengine
+      variableValue: ci configs mingw wayland x11 opengl
   enable_if:
       condition: property
       property: target.arch
@@ -79,10 +84,10 @@ target4: &target4
       variableValue: qemux86
     - type: EnvironmentVariable
       variableName: MANIFEST
-      variableValue: nanbield.xml
+      variableValue: whinlatter.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs wayland mingw no-webengine
+      variableValue: ci configs wayland opengl
   enable_if:
       condition: property
       property: target.arch
@@ -95,10 +100,10 @@ target5: &target5
       variableValue: qemuarm64
     - type: EnvironmentVariable
       variableName: MANIFEST
-      variableValue: kirkstone.xml
+      variableValue: scarthgap.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs wayland static no-webengine
+      variableValue: ci configs wayland opengl static
   enable_if:
       condition: property
       property: target.arch
@@ -114,11 +119,27 @@ target6: &target6
       variableValue: master.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs wayland python
+      variableValue: ci configs x11
   enable_if:
       condition: property
       property: target.arch
-      equals_value: INSIGNIFICANT_TARGET1
+      equals_value: TARGET6
+target7: &target7
+  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 x11 opengl clang
+  enable_if:
+      condition: property
+      property: target.arch
+      equals_value: TARGET7
 
 instructions:
   Build:
@@ -128,6 +149,7 @@ instructions:
   - *target4
   - *target5
   - *target6
+  - *target7
   - type: EnvironmentVariable
     variableName: DL_DIR
     variableValue: "/mnt/yocto-cache/downloads"
@@ -154,21 +176,31 @@ instructions:
       chmod +x repo
 
       ./repo init \
-          --repo-url https://github.com/theqtcompany/git-repo \
+          --repo-url git@git.qt.io:boot2qt/git-repo.git \
           -u git://code.qt.io/yocto/boot2qt-manifest \
           -b ci \
           -m ${MANIFEST} \
           --reference /mnt/yocto-cache/mirror
       ./repo sync
 
-      source ./poky/oe-init-build-env
+      source ./openembedded-core/oe-init-build-env
+
+      # check compatibility agaist current Yocto master
+      if [ -n "${CHECK_COMPATIBILITY}" ]; then
+        yocto-check-layer ${SOURCE_DIR} \
+          --dependency \
+            ../meta-openembedded/meta-oe \
+            ../meta-openembedded/meta-python \
+          --additional-layer \
+            ../meta-mingw \
+          --no-auto-dependency
+      fi
+
+      bitbake-layers add-layer ../meta-yocto/meta-poky
       bitbake-layers add-layer ../meta-openembedded/meta-oe
       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
@@ -176,7 +208,10 @@ instructions:
       done
 
       # build toolchain which should include all supported recipes
-      bitbake meta-toolchain-qt6 nativesdk-packagegroup-qt6-toolchain-host packagegroup-qt6-modules
+      bitbake meta-toolchain-qt6 \
+          nativesdk-packagegroup-qt6-toolchain-host \
+          packagegroup-qt6-modules \
+          packagegroup-qt6-examples
     filename: "{{.BuildDir}}/start-build"
     fileMode: 420
   - type: ExecuteCommand

coin/test-clang.inc

@@ -0,0 +1,4 @@
+PREFERRED_TOOLCHAIN_TARGET = "clang"
+DISTRO_FEATURES:append = " ld-is-lld"
+
+INSANE_SKIP:grpc-dbg = "buildpaths"

coin/test-configs.inc

@@ -1,3 +1,4 @@
+DISTRO = "poky"
 # use systemd
 INIT_MANAGER:forcevariable = "systemd"
 
@@ -31,71 +32,25 @@ WARN_QA:remove = "${EXTRA_QA}"
 # nativesdk-qemu-user-mips rdepends on nativesdk-bash, but it isn't a build dependency
 INSANE_SKIP:nativesdk-qemu-user-mips = "build-deps"
 
+# workaround for clang
+# nativesdk-liblldb contains reference to TMPDIR [buildpaths]
+INSANE_SKIP:append:pn-nativesdk-clang = " buildpaths"
+
 # 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"
 
 PACKAGECONFIG:append:pn-qtbase = "\
-    tslib kms gbm zstd libproxy gssapi vulkan mtdev cups \
+    tslib libproxy gssapi mtdev cups ctf \
     sql-mysql sql-odbc sql-psql sql-sqlite journald brotli \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
-    use-gold-linker \
 "
 
-# imageformats mng FIXME
-PACKAGECONFIG:append:pn-qtimageformats = " jasper"
+RDEPENDS:${PN}:append:pn-packagegroup-qt6-modules = " packagegroup-qt6-examples"
 
-# enable examples for all Qt modules
-PACKAGECONFIG:append:pn-qmlcompilerplus = " examples"
-PACKAGECONFIG:append:pn-qt3d = " examples"
-PACKAGECONFIG:append:pn-qt5compat = " examples"
-PACKAGECONFIG:append:pn-qtapplicationmanager = " examples"
-PACKAGECONFIG:append:pn-qtbase = " examples"
-PACKAGECONFIG:append:pn-qtcharts = " examples"
-PACKAGECONFIG:append:pn-qtcoap = " examples"
-PACKAGECONFIG:append:pn-qtconnectivity = " examples"
-PACKAGECONFIG:append:pn-qtdatavis3d = " examples"
-PACKAGECONFIG:append:pn-qtdeclarative = " examples"
-PACKAGECONFIG:append:pn-qtdeviceutilities = " examples"
-PACKAGECONFIG:append:pn-qtgraphs = " examples"
-PACKAGECONFIG:append:pn-qtgrpc = " examples"
-PACKAGECONFIG:append:pn-qthttpserver = " examples"
-PACKAGECONFIG:append:pn-qtimageformats = " examples"
-PACKAGECONFIG:append:pn-qtinsighttracker = " examples"
-PACKAGECONFIG:append:pn-qtinterfaceframework = " examples"
-PACKAGECONFIG:append:pn-qtlanguageserver = " examples"
-PACKAGECONFIG:append:pn-qtlocation = " examples"
-PACKAGECONFIG:append:pn-qtlottie = " examples"
-PACKAGECONFIG:append:pn-qtmqtt = " examples"
-PACKAGECONFIG:append:pn-qtmultimedia = " examples"
-PACKAGECONFIG:append:pn-qtnetworkauth = " examples"
-PACKAGECONFIG:append:pn-qtopcua = " examples"
-PACKAGECONFIG:append:pn-qtpdf = " examples"
-PACKAGECONFIG:append:pn-qtpositioning = " examples"
-PACKAGECONFIG:append:pn-qtquick3d = " examples"
-PACKAGECONFIG:append:pn-qtquick3dphysics = " examples"
-PACKAGECONFIG:append:pn-qtquickdesigner-components = " examples"
-PACKAGECONFIG:append:pn-qtquicktimeline = " examples"
-PACKAGECONFIG:append:pn-qtremoteobjects = " examples"
-PACKAGECONFIG:append:pn-qtscxml = " examples"
-PACKAGECONFIG:append:pn-qtsensors = " examples"
-PACKAGECONFIG:append:pn-qtserialbus = " examples"
-PACKAGECONFIG:append:pn-qtserialport = " examples"
-PACKAGECONFIG:append:pn-qtshadertools = " examples"
-PACKAGECONFIG:append:pn-qtspeech = " examples"
-PACKAGECONFIG:append:pn-qtsvg = " examples"
-PACKAGECONFIG:append:pn-qttools = " examples"
-PACKAGECONFIG:append:pn-qttranslations = " examples"
-PACKAGECONFIG:append:pn-qtvirtualkeyboard = " examples"
-PACKAGECONFIG:append:pn-qtvncserver = " examples"
-PACKAGECONFIG:append:pn-qtwayland = " examples"
-PACKAGECONFIG:append:pn-qtwebchannel = " examples"
-PACKAGECONFIG:append:pn-qtwebengine = " examples"
-PACKAGECONFIG:append:pn-qtwebsockets = " examples"
-PACKAGECONFIG:append:pn-qtwebview = " examples"
+# remove all main features, added back in different builds
+POKY_DEFAULT_DISTRO_FEATURES:remove = "opengl wayland vulkan"
+DISTRO_FEATURES_DEFAULT:remove = "x11"

coin/test-dunfell.inc

@@ -1 +0,0 @@
-LICENSE_FLAGS_WHITELIST = "commercial_ffmpeg commercial_x264"

coin/test-no-webengine.inc

@@ -1 +0,0 @@
-DISTRO_FEATURES:remove = "webengine"

coin/test-opengl.inc

@@ -0,0 +1,2 @@
+DISTRO_FEATURES:append = " opengl vulkan"
+DISTRO_FEATURES:append = " webengine"

coin/test-ptest.inc

@@ -0,0 +1,51 @@
+IMAGE_CLASSES += "testimage"
+QB_MEM = "-m 8192"
+TEST_SUITES = "ssh ping parselogs ptest"
+IMAGE_FEATURES += "ssh-server-dropbear"
+IMAGE_INSTALL:append = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-ptest', '', d)} \
+    qt5compat-ptest \
+    qtbase-ptest \
+    qtcharts-ptest \
+    qtcoap-ptest \
+    qtconnectivity-ptest \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdatavis3d-ptest', '', d)} \
+    qtdeclarative-ptest \
+    qtdeviceutilities-ptest \
+    qtgraphs-ptest \
+    qtgrpc-ptest \
+    qthttpserver-ptest \
+    qtimageformats-ptest \
+    qtinterfaceframework-ptest \
+    qtlocation-ptest \
+    qtlottie-ptest \
+    qtmqtt-ptest \
+    qtmultimedia-ptest \
+    qtnetworkauth-ptest \
+    qtopcua-ptest \
+    qtpositioning-ptest \
+    qtquick3d-ptest \
+    qtquickdesigner-components-ptest \
+    qtquicktimeline-ptest \
+    qtremoteobjects-ptest \
+    qtscxml-ptest \
+    qtsensors-ptest \
+    qtserialbus-ptest \
+    qtserialport-ptest \
+    qtshadertools-ptest \
+    qtspeech-ptest \
+    qtsvg-ptest \
+    qttools-ptest \
+    qtvirtualkeyboard-ptest \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-ptest', '', d)} \
+    qtwebchannel-ptest \
+    qtwebsockets-ptest \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf-ptest', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-ptest', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebview-ptest', '', d)} \
+    ${@bb.utils.contains('QT_COMMERCIAL_MODULES', '1', '\
+        qmlcompilerplus-ptest \
+        qtinsighttracker-ptest \
+        qtvncserver-ptest \
+        ', '', d)} \
+"

coin/test-python.inc

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

coin/test-static.inc

@@ -1,3 +1,5 @@
 PACKAGECONFIG:append:pn-qtbase = " static"
 QT_PTEST_ENABLED = "0"
-PACKAGECONFIG:remove:pn-qtapplicationmanager = "multi-process"
+PACKAGECONFIG:remove:pn-qtapplicationmanager = "multi-process bubblewrap"
+RDEPENDS:${PN}:remove:pn-packagegroup-qt6-modules = "packagegroup-qt6-examples"
+DISTRO_FEATURES:remove = "webengine"

coin/test-wayland.inc

@@ -1,2 +1 @@
-DISTRO_FEATURES:remove = "x11"
 DISTRO_FEATURES:append = " wayland"

coin/test-x11.inc

@@ -0,0 +1 @@
+DISTRO_FEATURES:append = " x11"

conf/layer.conf

@@ -18,7 +18,6 @@ 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"
@@ -36,12 +35,10 @@ LAYERVERSION_qt6-layer = "1"
 
 LAYERDEPENDS_qt6-layer = "core openembedded-layer meta-python"
 
-LAYERSERIES_COMPAT_qt6-layer = "dunfell gatesgarth hardknott honister kirkstone langdale mickledore nanbield scarthgap"
+LAYERSERIES_COMPAT_qt6-layer = "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}"
 
@@ -49,12 +46,9 @@ QT_GIT_PROJECT ?= "qt"
 QT_GIT ?= "git://code.qt.io"
 QT_GIT_PROTOCOL ?= "git"
 QT_EDITION ?= "opensource"
-QT_VERSION = "6.6.3"
+QT_VERSION = "6.11.0"
 
 QT_COMMERCIAL_GIT ?= "git://codereview.qt-project.org"
 QT_COMMERCIAL_GIT_PROTOCOL ?= "ssh"
 
 QT_COMMERCIAL_MODULES ?= "0"
-
-# License mapping back to old license files
-SPDXLICENSEMAP[GFDL-1.3-no-invariants-only] = "GFDL-1.3"

dynamic-layers/meta-python/recipes-devtools/python/python3-antlr4-runtime_4.9.2.bb

@@ -1,9 +0,0 @@
-PYPI_PACKAGE = "antlr4-python3-runtime"
-inherit pypi setuptools3
-
-LICENSE = "BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=c96f0ee5f5d08fd4387e5f00507bb13e"
-
-SRC_URI[sha256sum] = "31f5abdc7faf16a1a6e9bf2eb31565d004359b821b09944436a34361929ae85a"
-
-BBCLASSEXTEND = "nativesdk native"

dynamic-layers/meta-python/recipes-devtools/python/python3-path_16.2.0.bb

@@ -1,8 +0,0 @@
-inherit pypi setuptools3
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6"
-
-SRC_URI[sha256sum] = "2de925e8d421f93bcea80d511b81accfb6a7e6b249afa4a5559557b0cf817097"
-
-BBCLASSEXTEND = "nativesdk native"

dynamic-layers/meta-python/recipes-devtools/python/python3-pathtools3_0.2.1.bb

@@ -1,8 +0,0 @@
-inherit pypi setuptools3
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=56bd93578433bb99b4fdf7ff481722df"
-
-SRC_URI[sha256sum] = "630c1edc09ef93abea40fc06b10067e5734d8f38cc85867bc61d1a5c9eb7796f"
-
-BBCLASSEXTEND = "nativesdk native"

dynamic-layers/meta-python/recipes-devtools/python/python3-qface_2.0.4.bb

@@ -1,21 +0,0 @@
-inherit pypi setuptools3
-
-DEPS += " python3-jinja2 \
-          python3-click \
-          python3-pyyaml \
-          python3-pytest \
-          python3-six \
-          python3-path \
-          python3-antlr4-runtime \
-          python3-watchdog \
-          python3-markupsafe \
-          python3-setuptools \
-        "
-DEPENDS += "${DEPS}"
-RDEPENDS:${PN} += "${DEPS}"
-
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=eee61e10a40b0e3045ee5965bcd9a8b5"
-SRC_URI[sha256sum] = "42b0a0d37ed77cf1a9994f5ed77e3a6138468241df1700667a9ab0b848d6ad57"
-
-BBCLASSEXTEND = "nativesdk native"

dynamic-layers/meta-python/recipes-devtools/python/python3-watchdog_0.9.0.bb

@@ -1,11 +0,0 @@
-DEPS = "python3-pathtools3"
-DEPENDS = "${DEPS}"
-RDEPENDS:${PN} = "${DEPS}"
-inherit pypi setuptools3
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRC_URI[sha256sum] = "965f658d0732de3188211932aeb0bb457587f04f63ab4c1e33eab878e9de961d"
-
-BBCLASSEXTEND = "nativesdk native"

dynamic-layers/openembedded-layer/recipes-graphics/spir/spirv-tools_%.bbappend

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

licenses/Squish-Commercial-License-Agreement

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

recipes-core/minizip/minizip_1.2.11.bb

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

recipes-devtools/python/python3-appdirs_1.4.4.bbappend

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

recipes-devtools/python/python3-qface_2.0.11.bb

@@ -0,0 +1,27 @@
+SUMMARY = "A generator framework based on a common modern IDL"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=eee61e10a40b0e3045ee5965bcd9a8b5"
+
+SRC_URI[sha256sum] = "b55c239f3ae7e23c5c8434f38901c5bcacb6afd17e88e37934b46e44558df295"
+
+inherit pypi setuptools3
+
+# Colorama is optional dependency from coloredlogs, but
+# it seems to be required in general, at least on windows
+DEPS = "\
+    python3-antlr4-runtime \
+    python3-argh \
+    python3-click \
+    python3-coloredlogs \
+    python3-jinja2 \
+    python3-markupsafe \
+    python3-pyyaml \
+    python3-six \
+    python3-watchdog \
+    python3-pytest \
+    python3-colorama \
+"
+DEPENDS += "${DEPS}"
+RDEPENDS:${PN} += "${DEPS}"
+
+BBCLASSEXTEND = "nativesdk native"

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

@@ -1,10 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,102 +0,0 @@
-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

@@ -1,32 +0,0 @@
-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

@@ -1,61 +0,0 @@
-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

@@ -1,9 +0,0 @@
-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-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-addons.bb

@@ -11,18 +11,22 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 RDEPENDS:${PN} += " \
     nativesdk-qtapplicationmanager-dev \
     nativesdk-qtapplicationmanager-tools \
+    nativesdk-qtcanvaspainter-dev \
+    nativesdk-qtcanvaspainter-tools \
     nativesdk-qtgrpc-dev \
     nativesdk-qtgrpc-tools \
+    nativesdk-qtlottie-dev \
+    nativesdk-qtlottie-tools \
     nativesdk-qtquick3d-dev \
     nativesdk-qtquick3d-tools \
+    nativesdk-qtopcua-dev \
+    nativesdk-qtopcua-tools \
     nativesdk-qtremoteobjects-dev \
     nativesdk-qtremoteobjects-tools \
     nativesdk-qtscxml-dev \
     nativesdk-qtscxml-tools \
     nativesdk-qtshadertools-dev \
     nativesdk-qtshadertools-tools \
-    nativesdk-qtwayland-dev \
-    nativesdk-qtwayland-tools \
     ${FORLINUXHOST} \
 "
 

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

@@ -9,7 +9,9 @@ inherit packagegroup nativesdk
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS:${PN} += " \
+    nativesdk-cmake \
     nativesdk-make \
+    nativesdk-ninja \
     nativesdk-packagegroup-qt6-toolchain-host-essentials \
     nativesdk-packagegroup-qt6-toolchain-host-addons \
     ${@bb.utils.contains('QT_COMMERCIAL_MODULES', '1', 'nativesdk-packagegroup-qt6-toolchain-host-commercial', '', d)} \
@@ -18,8 +20,6 @@ RDEPENDS:${PN} += " \
 
 FORLINUXHOST:mingw32 = ""
 FORLINUXHOST = " \
-    nativesdk-cmake \
-    nativesdk-ninja \
     nativesdk-perl-modules \
     nativesdk-python3-html5lib \
 "

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

@@ -11,11 +11,13 @@ RDEPENDS:${PN} += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d', '', d)} \
     qt5compat \
     qtapplicationmanager \
+    qtcanvaspainter \
     qtcharts \
     qtcoap \
     qtconnectivity \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdatavis3d', '', d)} \
     qtdeviceutilities \
+    qtdoc \
     qtgraphs \
     qtgrpc \
     qthttpserver \
@@ -40,6 +42,7 @@ RDEPENDS:${PN} += " \
     qtshadertools \
     qtspeech \
     qtsvg \
+    qttasktree \
     qttranslations \
     qtvirtualkeyboard \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
@@ -49,20 +52,27 @@ RDEPENDS:${PN} += " \
 
 RDEPENDS:${PN}:append:aarch64 = "\
     qtquick3dphysics \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
 "
 RDEPENDS:${PN}:append:arm = " qtquick3dphysics"
 RDEPENDS:${PN}:append:armv6 = "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
 "
 RDEPENDS:${PN}:append:armv7a = "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
 "
 RDEPENDS:${PN}:append:armv7ve = "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
 "
 RDEPENDS:${PN}:append:x86 = " qtquick3dphysics"
 RDEPENDS:${PN}:append:x86-64 = "\
     qtquick3dphysics \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
 "
+
+RDEPENDS:${PN}:remove:libc-musl = "qtpdf qtwebengine qtwebview"

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

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

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

@@ -0,0 +1,84 @@
+DESCRIPTION = "Qt6 examples"
+LICENSE = "MIT"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit packagegroup
+
+RDEPENDS:${PN} += " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d-examples', '', d)} \
+    qt5compat-examples \
+    qtapplicationmanager-examples \
+    qtbase-examples \
+    qtcanvaspainter-examples \
+    qtcharts-examples \
+    qtcoap-examples \
+    qtconnectivity-examples \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdatavis3d-examples', '', d)} \
+    qtdeclarative-examples \
+    qtdeviceutilities-examples \
+    qtdoc-examples \
+    qtgraphs-examples \
+    qtgrpc-examples \
+    qthttpserver-examples \
+    qtinterfaceframework-examples \
+    qtlocation-examples \
+    qtmqtt-examples \
+    qtmultimedia-examples \
+    qtnetworkauth-examples \
+    qtopcua-examples \
+    qtpositioning-examples \
+    qtquick3d-examples \
+    qtremoteobjects-examples \
+    qtscxml-examples \
+    qtsensors-examples \
+    qtserialbus-examples \
+    qtserialport-examples \
+    qtspeech-examples \
+    qttasktree-examples \
+    qttools-examples \
+    qtvirtualkeyboard-examples \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland-examples', '', d)} \
+    qtwebchannel-examples \
+    qtwebsockets-examples \
+"
+
+RDEPENDS:${PN}:append:aarch64 = "\
+    qtquick3dphysics-examples \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf-examples', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-examples qtwebview-examples', '', d)} \
+"
+RDEPENDS:${PN}:append:arm = "\
+    qtquick3dphysics-examples \
+"
+RDEPENDS:${PN}:append:armv6 = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf-examples', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-examples qtwebview-examples', '', d)} \
+"
+RDEPENDS:${PN}:append:armv7a = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf-examples', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-examples qtwebview-examples', '', d)} \
+"
+RDEPENDS:${PN}:append:armv7ve = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf-examples', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-examples qtwebview-examples', '', d)} \
+"
+RDEPENDS:${PN}:append:x86 = "\
+    qtquick3dphysics-examples \
+"
+RDEPENDS:${PN}:append:x86-64 = "\
+    qtquick3dphysics-examples \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf-examples', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-examples qtwebview-examples', '', d)} \
+"
+
+RDEPENDS:${PN}:remove:libc-musl = "qtpdf-examples qtwebengine-examples qtwebview-examples"
+
+COMMERCIAL_EXAMPLES = " \
+    qtinsighttracker-examples \
+    qtvncserver-examples \
+"
+RDEPENDS:${PN} += "\
+    ${@bb.utils.contains('QT_COMMERCIAL_MODULES', '1', '${COMMERCIAL_EXAMPLES}', '', d)} \
+"
+

recipes-qt/qt6/chromium-gn.inc

@@ -4,6 +4,7 @@ inherit linuxloader
 inherit qemu
 
 COMPATIBLE_MACHINE = "(-)"
+COMPATIBLE_MACHINE:libc-musl = "(-)"
 COMPATIBLE_MACHINE:aarch64 = "(.*)"
 COMPATIBLE_MACHINE:armv6 = "(.*)"
 COMPATIBLE_MACHINE:armv7a = "(.*)"
@@ -43,6 +44,10 @@ DEBUG_FLAGS:append:aarch64 = "-g1"
 DEBUG_FLAGS:remove:x86-64 = "-g"
 DEBUG_FLAGS:append:x86-64 = "-g1"
 
+# The default debug level flag has moved from DEBUG_FLAGS to a new
+# variable starting with Yocto 'styhead' (5.1) release
+DEBUG_LEVELFLAG = "-g1"
+
 # V8's JIT infrastructure requires binaries such as mksnapshot and
 # mkpeephole to be run in the host during the build. However, these
 # binaries must have the same bit-width as the target (e.g. a x86_64

recipes-qt/qt6/conan.inc

@@ -1,52 +0,0 @@
-# Generate Conan profile
-do_install:append:class-target() {
-    install -d ${D}${datadir}/conan
-    cat > ${D}${datadir}/conan/profile <<EOF
-[settings]
-os=Linux
-arch=${@map_conan_arch(d.getVar('TARGET_ARCH'), d)}
-compiler=gcc
-compiler.version=$(${CC} -dumpfullversion | cut -d . -f 1,2)
-compiler.libcxx=libstdc++11
-build_type=${BUILD_TYPE}
-[options]
-qtbase:cmake_args_qtbase="${@cmake_args_qtbase(d)}"
-*:cmake_args_leaf_module=""
-[build_requires]
-[env]
-CONAN_CMAKE_GENERATOR=${OECMAKE_GENERATOR}
-EOF
-}
-
-def map_conan_arch(a, d):
-    import re
-
-    valid_archs = "x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, \
-                  armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, \
-                  sparc, sparcv9, mips, mips64, avr, s390, s390x, asm.js, wasm, sh4le, \
-                  e2k-v2, e2k-v3, e2k-v4, e2k-v5, e2k-v6, e2k-v7, xtensalx6, xtensalx106"
-
-    if   re.match('i.86$', a):                  return 'x86'
-    elif re.match('x86.64$', a):                return 'x86_64'
-    elif re.match('arm$', a):                   return 'arm'
-    elif re.match('aarch64$', a):               return 'armv8'
-    elif re.match('mips(isa32)?(el)?$', a):     return 'mips'
-    elif re.match('mips(isa)?(64)?(el)?$', a):  return 'mips64'
-    elif re.match('p(pc|owerpc)$', a):          return 'ppc32be'
-    elif re.match('p(pc|owerpc)le$', a):        return 'ppc32'
-    elif re.match('p(pc|owerpc)64$', a):        return 'ppc64'
-    elif re.match('p(pc|owerpc)64le$', a):      return 'ppc64le'
-    elif re.match('sh4$', a):                   return 'sh4le'
-    elif a in valid_archs:                      return a
-    else:
-        bb.warn("cannot map '%s' to a conan architecture" % a)
-
-def cmake_args_qtbase(d):
-    import re
-    rm_args = ['-DQT_HOST_PATH[^ ]*']
-    args = d.getVar('EXTRA_OECMAKE')
-    for arg in rm_args:
-        args = re.sub(arg, '', args)
-    return args
-
-FILES:${PN}-dev += "${datadir}/conan"

recipes-qt/qt6/gn-utils.inc

@@ -46,6 +46,24 @@ def gn_target_arch_name(d):
                  'GN_TARGET_ARCH_NAME variable could not be found.')
     return name
 
+def gn_host_pkg_config(d):
+    """Return absolute paths to pkg-config-native."""
+    return d.getVar("STAGING_BINDIR_NATIVE") + "/" + "pkg-config-native"
+
+def gn_clang(d):
+    """Return true if using clang compiler else return false"""
+    if "clang++" in d.getVar("CXX"):
+        return "true"
+    else:
+        return "false"
+
+def gn_clang_native(d):
+    """Return true if using native clang compiler else return false"""
+    if "clang++" in d.getVar("BUILD_CXX"):
+        return "true"
+    else:
+        return "false"
+
 def write_toolchain_file(d, file_path):
     """Creates a complete GN toolchain file in |file_path|."""
     import string
@@ -68,14 +86,17 @@ def write_toolchain_file(d, file_path):
         '  toolchain_args = {\n'
         '    current_cpu = "${current_cpu}"\n'
         '    current_os = "linux"\n'
-        '    is_clang = false\n'
+        '    is_clang = ${is_clang}\n'
+        '    host_pkg_config = "${host_pkg_config}"\n'
         '  }\n'
         '}\n'
     )
 
     native_toolchain = {
         'toolchain_name': 'yocto_native',
+        'is_clang': gn_clang_native(d),
         'current_cpu': gn_host_arch_name(d),
+        'host_pkg_config': gn_host_pkg_config(d),
         'cc': d.expand('${BUILD_CC}'),
         'cxx': d.expand('${BUILD_CXX}'),
         'ar': d.expand('${BUILD_AR}'),
@@ -88,7 +109,9 @@ def write_toolchain_file(d, file_path):
     }
     target_toolchain = {
         'toolchain_name': 'yocto_target',
+        'is_clang': gn_clang(d),
         'current_cpu': gn_target_arch_name(d),
+        'host_pkg_config': gn_host_pkg_config(d),
         'cc': d.expand('${CC}'),
         'cxx': d.expand('${CXX}'),
         'ar': d.expand('${AR}'),

recipes-qt/qt6/ptest/run-ptest

@@ -5,8 +5,22 @@ if [ ! -s tst_list ]; then
     exit 0
 fi
 
-export LANG=C.UTF-8
-export QT_QPA_PLATFORM=offscreen
+if [ -z "$LANG" ]; then
+    export LANG=C.UTF-8
+fi
+if [ -z "$QT_QPA_PLATFORM" ]; then
+    export QT_QPA_PLATFORM=offscreen
+fi
+if [ $UID -ne 0 ]; then
+    if [ ! -w ${HOME} ]; then
+        echo "Home directory should be writable, run as root:"
+        echo "usermod -d /home/${USER} ${USER} && mkhomedir_helper ${USER}"
+    fi
+fi
+if [ $UID -eq 0 ]; then
+    export QTWEBENGINE_DISABLE_SANDBOX=1
+fi
+
 for test in $(cat tst_list); do
     (
     cd $(dirname ${test})

recipes-qt/qt6/qmlcompilerplus_git.bb

@@ -1,6 +1,8 @@
 LICENSE = "The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
-    file://src/qmlcompilerplus/cppcodegen_p.h;endline=27;md5=6a1dccd03d0d5864357e72b67def8ff2 \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
 "
 
 inherit qt6-cmake

recipes-qt/qt6/qt3d-examples_git.bb

@@ -0,0 +1,23 @@
+LICENSE = "(The-Qt-Company-Commercial | BSD-3-Clause) & CC-BY-4.0 & LicenseRef-MIRAMAR"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/CC-BY-4.0.txt;md5=ed88d31cea57b15030a1f58ceb04e0d5 \
+    file://LICENSES/LicenseRef-MIRAMAR.txt;md5=6dd50bdc58b03a7976544fb939d5647b \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+NO_GENERIC_LICENSE[LicenseRef-MIRAMAR] = "LICENSES/LicenseRef-MIRAMAR.txt"
+
+inherit qt6-cmake
+inherit features_check
+
+REQUIRED_DISTRO_FEATURES = "opengl"
+
+QT_MODULE = "qt3d"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS = "\
+    qt3d \
+    qtdeclarative-native \
+"

recipes-qt/qt6/qt3d_git.bb

@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = " \
     file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
     file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
     file://src/3rdparty/assimp/LICENSE;md5=2119edef0916b0bd511cb3c731076271 \
-    file://src/3rdparty/imgui/LICENSE_imstb.txt;md5=2c03212e4ad1f727e9c2251327812596 \
-    file://src/3rdparty/imgui/LICENSE_proggyclean.txt;md5=f9db3a4f99ffc4d38de6bb590db15f31 \
-    file://src/3rdparty/imgui/LICENSE.txt;md5=f3c4ae64ab2a23f1b8734609e1a2d48a \
+    file://src/3rdparty/imgui/LICENSE.imstb.txt;md5=2c03212e4ad1f727e9c2251327812596 \
+    file://src/3rdparty/imgui/LICENSE.proggyclean.txt;md5=f9db3a4f99ffc4d38de6bb590db15f31 \
+    file://src/3rdparty/imgui/LICENSE.txt;md5=875a54e93593c8b244ef6b78cacc336e \
 "
 
 inherit qt6-cmake
@@ -24,9 +24,12 @@ 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
+CFLAGS:append:libc-musl = " -DIOAPI_NO_64 -D_GNU_SOURCE"
+
 DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtshadertools qtshadertools-native"
 
 PACKAGECONFIG[system-assimp] = "-DFEATURE_qt3d_system_assimp=ON,-DQT_FEATURE_qt3d_system_assimp=OFF,assimp"

recipes-qt/qt6/qt5compat-examples_git.bb

@@ -0,0 +1,14 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qt5compat"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "qt5compat"

recipes-qt/qt6/qt5compat_git.bb

@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \
     file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
     file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
     file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
-    file://src/core5/codecs/QTSCIICODEC_LICENSE.txt;md5=f36a16de69d08da0af83ce2a672d8972 \
+    file://src/core5/codecs/LICENSE.QTSCIICODEC.txt;md5=f36a16de69d08da0af83ce2a672d8972 \
 "
 
 inherit qt6-cmake

recipes-qt/qt6/qt6-commercial.inc

@@ -5,4 +5,4 @@ python() {
 
 QT_GIT = "${QT_COMMERCIAL_GIT}"
 QT_GIT_PROTOCOL = "${QT_COMMERCIAL_GIT_PROTOCOL}"
-QT_MODULE = "tqtc-${BPN}"
+QT_MODULE_REPO = "tqtc-${QT_MODULE}"

recipes-qt/qt6/qt6-examples.inc

@@ -0,0 +1,18 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${QT_MODULE}:"
+
+EXTRA_OECMAKE += "\
+    -DQT_BUILD_TESTS=OFF \
+    -DQT_BUILD_STANDALONE_EXAMPLES=ON \
+    -DQT_NO_FAKE_STANDALONE_EXAMPLE_INSTALL_PREFIX=ON \
+"
+
+# use debug sources from the module
+PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
+TARGET_DBGSRC_DIR = "/usr/src/debug/${QT_MODULE}/${PV}"
+
+FILES:${PN} = " \
+    ${QT6_INSTALL_EXAMPLESDIR} \
+"
+
+INSANE_SKIP:${PN} += "libdir dev-so"
+INSANE_SKIP:${PN}-dbg += "libdir"

recipes-qt/qt6/qt6-git.inc

@@ -4,69 +4,72 @@ HOMEPAGE ?= "https://www.qt.io"
 inherit srcrev-update
 
 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "6.6"
+QT_MODULE_BRANCH ?= "dev"
 QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
-QT_MODULE_REPO ?= "${QT_MODULE}.git"
+QT_MODULE_REPO ?= "${QT_MODULE}"
 
-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}"
 
-CVE_PRODUCT:append = " qt"
+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}"
 
-S = "${WORKDIR}/git"
+CVE_PRODUCT ?= "qt:${BPN} qt:qt"
 
 PV = "${QT_VERSION}"
 
-SRCREV = "${SRCREV_${QT_MODULE}}"
+SRCREV = "${SRCREV_${QT_MODULE_REPO}}"
 
-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 = "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 = "5007f966daac7e132a8e158c874281730e67ebeb"
-SRCREV_qtvirtualkeyboard = "8a8fbb8888e04322909658a1328f20dec0f3c94c"
-SRCREV_qtwayland = "c48bc5a760fcf3311998297efb02e5c4bdfde70f"
-SRCREV_qtwebchannel = "a836e598960cd61e256e077c331b38bca662b77d"
-SRCREV_qtwebengine = "ee8f63ea4b325404529f231273adf1fb6eb874d1"
-SRCREV_qtwebengine-chromium = "34ec0d3e7bacfea89889641a8f4320d8ffcfa9af"
-SRCREV_qtwebsockets = "26db5812958bc8bcf6e333357760c3023631eae3"
-SRCREV_qtwebview = "2ba692f13a218edd824ae6307791faeb24c5a48b"
+SRCREV_tqtc-qmlcompilerplus = "2f2395a50b0ddb1af6b699a90cfbe2164f67b6e7"
+SRCREV_tqtc-qtinsighttracker = "ac8972a670cf492ce2d2cf4ab757c43c5291804f"
+SRCREV_tqtc-qtvncserver = "8bfcb2ede4e5021a637933ec927ce2678fdc7f0c"
+SRCREV_qt3d = "1cac4a649679618f1301aba0074dae063eac6b98"
+SRCREV_qt3d-assimp = "488a2f7af2920295ada886f113a0d563dab79b8d"
+SRCREV_qt5compat = "287be0a7793621dd4e6e780595bf20aa3ae2b2c4"
+SRCREV_qtbase = "bd04c5d7a4b907b8c4a2d2dda4ba3f24f687fb7f"
+SRCREV_qtapplicationmanager = "4bd1f1fba3f803a7284a5110e117e8d162d54065"
+SRCREV_qtcanvaspainter = "689445d357df249cdf0d5ec0437bd6b8b68368c8"
+SRCREV_qtcharts = "46a2c96f3e376bc2de0e0710ec0e143c1a784081"
+SRCREV_qtcoap = "fbd3db03f13a7d1fd79aaa2392e331a1737f7f68"
+SRCREV_qtconnectivity = "e2bee5bf54cb0ac721fd9da0884a8f5a251e63fa"
+SRCREV_qtdatavis3d = "ca8d79677e63c3111536f9b03c4184f732810498"
+SRCREV_qtdeclarative = "59da4b17158303fc671869547bcb91b675bf4702"
+SRCREV_qtdeviceutilities = "4f86edb2eb255397f849528f43f49a59d4973109"
+SRCREV_qtdoc = "42cd131492d531dc32660f79e81c6f85dbc56a12"
+SRCREV_qtgraphs = "c08c320fc36fa31b264ac3c8f0f62aa94ac41b30"
+SRCREV_qtgrpc = "2bccf14f841bca476a6f90242b30368742de4a66"
+SRCREV_qthttpserver = "648e8b021ee219c7034c357cd9a5424a3040dfad"
+SRCREV_qtimageformats = "cb96a5aa2e37e0a6d31df138d24c207c6951de3a"
+SRCREV_qtinterfaceframework = "1dfaeb1d7c2cb60b56d4c9e1ff6e622e03d86d97"
+SRCREV_qtlanguageserver = "8599dad24858f93876012bd2071d096a31dfda0a"
+SRCREV_qtlocation = "8d13de6bc6a2207eca4eded65741a28d95d433a3"
+SRCREV_qtlottie = "3a5ce6df4ba97e29e7d7dc16c2bb3e849885d8fb"
+SRCREV_qtmqtt = "4f6e8dd0f1c78926394335686cfa8537303b1a07"
+SRCREV_qtmultimedia = "074d188889891972cb456817510f62b158e9ca67"
+SRCREV_qtnetworkauth = "0b8d323ae151f3826d7b5a223d80e5293cd1ed06"
+SRCREV_qtopcua = "f4dd8c4011d4ba3d11fbaaede379de247fe09690"
+SRCREV_qtpositioning = "56ede83df68dcb1048564aa463f8b48985f5f99e"
+SRCREV_qtquick3d = "3468786a6e3320eca9d4cc6d5444636ba5d88c73"
+SRCREV_qtquick3d-assimp = "488a2f7af2920295ada886f113a0d563dab79b8d"
+SRCREV_qtquick3dphysics = "9c860d931ef38751a1bc03ef813610dbd7793469"
+SRCREV_qtquickdesigner-components = "8c9e0faa0dd8b8adf019e357212e59898a7bebfb"
+SRCREV_qtquicktimeline = "831a9978aee0e963b88f5cb122228ecb7b99b13d"
+SRCREV_qtremoteobjects = "6c1fe0e164815b540b996d3246634b5e43d3ccb9"
+SRCREV_qtscxml = "604aa8558028411a9b9ac3c4bd813231db2264d0"
+SRCREV_qtsensors = "8d6d925ae615a23c8b84b51ad3701dce78afc53c"
+SRCREV_qtserialbus = "c5d1600f1270a8e4953d1c074b9faed7d99fdd2d"
+SRCREV_qtserialport = "cc95fa549119370ef78587af749e8f17544c95cc"
+SRCREV_qtshadertools = "45ef193c92f93c7a0bf8de53163a9ca8886f8267"
+SRCREV_qtspeech = "63e490d12db7790b29fa61f0c6e0677cef7074e9"
+SRCREV_qtsvg = "7c65619dc929ebf52b63251e8601b47f2f2ee207"
+SRCREV_qttasktree = "93e1d91ac78e232c3ca6b1db0031a30d08b334dd"
+SRCREV_qttools = "369f8a1fa6ac7527227df7a99399b0428a16ba97"
+SRCREV_qttools-qlitehtml = "3fe5821dad98747d6e41c9ed54b86c3d0eee9daf"
+SRCREV_qttools-qlitehtml-litehtml = "6ca1ab0419e770e6d35a1ef690238773a1dafcee"
+SRCREV_qttranslations = "0a794041faf3e647ff9623d99754a8cfdaa68a47"
+SRCREV_qtvirtualkeyboard = "e9d1ea1624cf2c961ba4aa077090367d108b130a"
+SRCREV_qtwayland = "586e489ce426e833729c333499cb98a06fbae1b0"
+SRCREV_qtwebchannel = "227750ae26054f88c202c370930c1dccf529b7fc"
+SRCREV_qtwebengine = "152b67fa5b7862d2a63fd0574ebeb4759335b935"
+SRCREV_qtwebengine-chromium = "031a10673ee369c84b2db2669fc147adf175a3be"
+SRCREV_qtwebsockets = "f269b863b994977ae8f937620c99c60e811fcbf9"
+SRCREV_qtwebview = "374f9d6ebc7226b68b4e336a136e99e73fd42b44"

recipes-qt/qt6/qt6-ptest.inc

@@ -28,10 +28,12 @@ EOF
         -DPython3_EXECUTABLE=${PYTHON} \
         ${EXTRA_OECMAKE} \
         -DQT_BUILD_STANDALONE_TESTS=ON \
-        -DQT_ADDITIONAL_PACKAGES_PREFIX_PATH=${D}${QT6_INSTALL_LIBDIR}/cmake \
+        -DQT_BUILD_EXAMPLES=OFF \
+        -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 \
+        -DQT_FORCE_BUILTIN_TESTDATA=ON \
         ${S} \
         -Wno-dev
     ${CMAKE_VERBOSE} cmake --build ${B_PTEST} --target all
@@ -40,17 +42,23 @@ EOF
     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/$tests \
-                \( -wholename "*/.*" -o -wholename "*autogen*" -o -iwholename "*cmake*" -o -name Makefile \) \
-                -delete
-
-            # tests may depend on files from sources
-            cp -r ${S}/tests/$tests ${D}${PTEST_PATH}/tests
+            find ${B_PTEST}/tests/$tests ! -type d -a \( \
+                    -executable -o \
+                    -name qmldir -o \
+                    -name *.rcc \
+                \) -exec sh -c '\
+                    install -D "$1" "${D}${PTEST_PATH}${1#${B_PTEST}}" \
+                ' _ {} \;
         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

@@ -1,12 +1,5 @@
 include recipes-qt/qt6/qt6-ptest.inc
 
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,"
-PACKAGECONFIG[tests] = "-DQT_BUILD_TESTS=ON,-DQT_BUILD_TESTS=OFF,"
-
-# For qmake projects
-EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', 'QT_BUILD_PARTS-=examples', d)}"
-EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tests', 'QT_BUILD_PARTS+=tests', 'QT_BUILD_PARTS-=tests', d)}"
-
 # If Qt6 (qtbase) is machine specific, then everything will be,
 # because the (initial) qtbase configuration becomes part of Qt5/qmake
 python __anonymous() {
@@ -30,14 +23,9 @@ python __anonymous() {
         d.appendVar("DEPENDS", " qmlcompilerplus-native")
 }
 
-# Many examples come with libraries installed outside of standard libdir,
-# suppress QA check complaining
-INSANE_SKIP:${PN}-dbg += "libdir"
-INSANE_SKIP:${PN}-examples += "libdir dev-so"
-
 SYSROOT_DIRS += "${QT6_INSTALL_BINDIR} ${QT6_INSTALL_LIBEXECDIR}"
 
-PACKAGE_BEFORE_PN = "${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-examples"
+PACKAGE_BEFORE_PN = "${PN}-qmlplugins ${PN}-tools ${PN}-plugins"
 
 ALLOW_EMPTY:${PN} = "1"
 ALLOW_EMPTY:${PN}-plugins = "1"
@@ -85,8 +73,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_ARCHDATADIR}/sbom \
     ${QT6_INSTALL_MKSPECSDIR} \
     ${QT6_INSTALL_QMLDIR}/*.qmltypes \
     ${QT6_INSTALL_QMLDIR}/*/*.qmltypes \
@@ -119,10 +108,3 @@ FILES:${PN}-staticdev += " \
     ${QT6_INSTALL_QMLDIR}/*/*/*/objects*/ \
     ${QT6_INSTALL_QMLDIR}/*/*/*/*/objects*/ \
 "
-
-# Note: INSTALL_EXAMPLESDIR is not used
-FILES:${PN}-examples = " \
-    ${QT6_INSTALL_EXAMPLESDIR} \
-    ${prefix}/examples \
-"
-RDEPENDS:${PN}-examples = "${PN}"

recipes-qt/qt6/qtapplicationmanager-examples_git.bb

@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtapplicationmanager"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtapplicationmanager \
+    qtapplicationmanager-native \
+    qtdeclarative-native \
+"

recipes-qt/qt6/qtapplicationmanager_git.bb

@@ -14,20 +14,26 @@ include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtdeclarative libyaml libarchive qtapplicationmanager-native"
+DEPENDS:append:libc-musl = " libexecinfo"
 RDEPENDS:${PN}:class-target = "libcrypto ${PN}-tools"
 
-PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'multi-process', '', d)}"
+EXTRA_OECMAKE += "-DQT_APPMAN_SKIP_EXCLUDE_TOOLS_FROM_DEFAULT_TARGET=ON"
+
+PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'multi-process bubblewrap', '', 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}"
 
 FILES:${PN}-tools = "\
+    ${QT6_INSTALL_BINDIR}/appman-package-server* \
     ${QT6_INSTALL_BINDIR}/appman-packager* \
-    ${QT6_INSTALL_BINDIR}/appman-dumpqmltypes* \
     ${QT6_INSTALL_BINDIR}/appman-qmltestrunner* \
 "
 
 BBCLASSEXTEND = "nativesdk native"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"

recipes-qt/qt6/qtbase-examples_git.bb

@@ -0,0 +1,14 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtbase"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "qtbase"

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

@@ -1,4 +1,4 @@
-From 4064b8757cbb28588fdff2529ea203bf3eabc579 Mon Sep 17 00:00:00 2001
+From 27896986b3c2930ccbbe062d3e7a0b7bcc08caf1 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <zecke@selfish.org>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
@@ -20,20 +20,20 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index 92729b06f1..dac7857600 100644
+index 4b116c54b2e..bfa21c997b4 100644
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -101,7 +101,12 @@ static QSettings *findConfiguration()
+@@ -103,7 +103,12 @@ static std::unique_ptr<QSettings> findConfiguration()
      if (qtconfManualPath)
-         return new QSettings(*qtconfManualPath, QSettings::IniFormat);
+         return std::make_unique<QSettings>(*qtconfManualPath, QSettings::IniFormat);
  
 -    QString qtconfig = QStringLiteral(":/qt/etc/qt.conf");
 +    QByteArray config = getenv("OE_QMAKE_QTCONF_PATH");
 +    QString qtconfig = QFile::decodeName(config);
 +    if (QFile::exists(qtconfig))
-+        return new QSettings(qtconfig, QSettings::IniFormat);
++        return std::make_unique<QSettings>(qtconfig, QSettings::IniFormat);
 +
 +    qtconfig = QStringLiteral(":/qt/etc/qt.conf");
-     if (QFile::exists(qtconfig))
-         return new QSettings(qtconfig, QSettings::IniFormat);
+     if (QResource(qtconfig, QLocale::c()).isValid())
+         return std::make_unique<QSettings>(qtconfig, QSettings::IniFormat);
  #ifdef Q_OS_DARWIN

recipes-qt/qt6/qtbase/0003-Add-OE-specific-specs-for-clang-compiler.patch

@@ -0,0 +1,67 @@
+From 9bf5632187b8f17cc0d626926df2784c38059875 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 3 Sep 2017 09:11:44 -0700
+Subject: [PATCH] Add OE specific specs for clang compiler
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Inappropriate [OE Specific]
+---
+ mkspecs/linux-oe-clang/qmake.conf      | 40 ++++++++++++++++++++++++++
+ mkspecs/linux-oe-clang/qplatformdefs.h |  1 +
+ 2 files changed, 41 insertions(+)
+ create mode 100644 mkspecs/linux-oe-clang/qmake.conf
+ create mode 100644 mkspecs/linux-oe-clang/qplatformdefs.h
+
+diff --git a/mkspecs/linux-oe-clang/qmake.conf b/mkspecs/linux-oe-clang/qmake.conf
+new file mode 100644
+index 0000000000..c09b132ac8
+--- /dev/null
++++ b/mkspecs/linux-oe-clang/qmake.conf
+@@ -0,0 +1,40 @@
++#
++# qmake configuration for linux-g++ with modifications for building with OpenEmbedded
++#
++
++MAKEFILE_GENERATOR = UNIX
++CONFIG += incremental
++QMAKE_INCREMENTAL_STYLE = sublib
++
++include(../common/linux.conf)
++
++# QMAKE_<TOOL> (moc, uic, rcc) are gone, overwrite only ar, objcopy and strip
++QMAKE_AR              = $$(OE_QMAKE_AR) cqs
++QMAKE_OBJCOPY         = $$(OE_QMAKE_OBJCOPY)
++QMAKE_STRIP           = $$(OE_QMAKE_STRIP)
++
++include(../common/gcc-base-unix.conf)
++
++# *FLAGS from gcc-base.conf
++QMAKE_CFLAGS                += $$(OE_QMAKE_CFLAGS)
++QMAKE_CXXFLAGS              += $$(OE_QMAKE_CXXFLAGS)
++QMAKE_LFLAGS                += $$(OE_QMAKE_LDFLAGS)
++
++include(../common/clang.conf)
++
++# tc settings from g++-base.conf
++QMAKE_CC       = $$(OE_QMAKE_CC)
++QMAKE_CXX      = $$(OE_QMAKE_CXX)
++
++QMAKE_LINK         = $$(OE_QMAKE_LINK)
++QMAKE_LINK_SHLIB   = $$(OE_QMAKE_LINK)
++QMAKE_LINK_C       = $$(OE_QMAKE_LINK)
++QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK)
++QMAKE_CFLAGS_ISYSTEM =
++# for the SDK
++isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG)
++
++include(../oe-device-extra.pri)
++
++load(device_config)
++load(qt_config)
+diff --git a/mkspecs/linux-oe-clang/qplatformdefs.h b/mkspecs/linux-oe-clang/qplatformdefs.h
+new file mode 100644
+index 0000000000..880c927b21
+--- /dev/null
++++ b/mkspecs/linux-oe-clang/qplatformdefs.h
+@@ -0,0 +1 @@
++#include "../linux-clang/qplatformdefs.h"

recipes-qt/qt6/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch

@@ -1,4 +1,4 @@
-From 07f7e1ae76b24ba64cd87726c438638a8fa3eba0 Mon Sep 17 00:00:00 2001
+From 9a8f4cadd4a90e0e5a347bb38210869a5fd28e0f Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Mon, 22 Aug 2022 15:01:28 +0300
 Subject: [PATCH] testlib: don't track the build or source directories
@@ -7,23 +7,22 @@ Build tests without location of the build and sources directories.
 
 Upstream-Status: Inappropriate [embedded specific]
 Change-Id: I8d5add473623a3d9f481097649819c9fb906e4b2
-
 ---
  src/testlib/CMakeLists.txt | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt
-index 6cdb8f3376..3007585e1c 100644
+index 15c040a2e3c..913e233a524 100644
 --- a/src/testlib/CMakeLists.txt
 +++ b/src/testlib/CMakeLists.txt
-@@ -121,8 +121,8 @@ set(qt_tc_build_dir_def
-     "$<IF:${qt_bool_tc_build_dir},${qt_tc_build_dir},$<TARGET_PROPERTY:BINARY_DIR>>"
+@@ -149,8 +149,8 @@ set(qt_tc_build_dir_def
+ 
+ string(JOIN "" testcase_dirs_genex
+     "$<$<NOT:$<BOOL:$<TARGET_PROPERTY:QT_SKIP_DEFAULT_TESTCASE_DIRS>>>:"
+-        "QT_TESTCASE_BUILDDIR=\"${qt_tc_build_dir_def}\"$<SEMICOLON>"
+-        "QT_TESTCASE_SOURCEDIR=\"$<TARGET_PROPERTY:SOURCE_DIR>\""
++        "QT_TESTCASE_BUILDDIR=\"\"$<SEMICOLON>"
++        "QT_TESTCASE_SOURCEDIR=\"\""
+     ">"
  )
  set_property(TARGET Test APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS
--    QT_TESTCASE_BUILDDIR="${qt_tc_build_dir_def}"
--    QT_TESTCASE_SOURCEDIR="$<TARGET_PROPERTY:SOURCE_DIR>"
-+    QT_TESTCASE_BUILDDIR=""
-+    QT_TESTCASE_SOURCEDIR=""
- )
- 
- qt_internal_add_docs(Test

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,24 +7,28 @@ 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 \
     file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
 "
 
-inherit qt6-cmake
+inherit qt6-cmake verify-qt-version
 
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
-include recipes-qt/qt6/conan.inc
 
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
-    file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+    file://0003-Add-OE-specific-specs-for-clang-compiler.patch \
     file://0004-Fix-qt.toolchain.cmake-for-SDK-use.patch \
     file://0005-testlib-don-t-track-the-build-or-source-directories.patch \
 "
+SRC_URI:append:class-native = "\
+    file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+"
 
 DEPENDS += "\
     patchelf-native \
@@ -33,18 +38,17 @@ DEPENDS += "\
 DEPENDS:remove:class-native = "qtbase-native"
 RDEPENDS_${PN}:remove:class-native = "libssl-native"
 
-RRECOMMENDS:${PN}:append:class-target = " locale-base-c"
+RRECOMMENDS:${PN}:append:libc-glibc:class-target = " locale-base-c"
 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 ?= "\
     ${PACKAGECONFIG_DEFAULT} \
     ${PACKAGECONFIG_GRAPHICS} \
-    ${PACKAGECONFIG_X11} \
-    ${PACKAGECONFIG_KDE} \
     ${PACKAGECONFIG_FONTS} \
     ${PACKAGECONFIG_SYSTEM} \
     ${PACKAGECONFIG_DISTRO} \
@@ -52,17 +56,21 @@ PACKAGECONFIG ?= "\
 
 PACKAGECONFIG_GRAPHICS ?= "\
     ${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \
-        bb.utils.contains('DISTRO_FEATURES', 'x11', 'gl', 'kms gbm gles2 eglfs', d), 'no-opengl linuxfb', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
+        bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms gbm gles2 eglfs', \
+            bb.utils.contains('DISTRO_FEATURES', 'x11', 'gl', \
+                'kms gbm gles2 eglfs', d), d), \
+        'no-opengl', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', '', d)} \
+    linuxfb \
 "
-PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', '', d)}"
-PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'sm cups kms gbm sql-sqlite', '', d)}"
 PACKAGECONFIG_FONTS ?= ""
 PACKAGECONFIG_SYSTEM ?= ""
 PACKAGECONFIG_DISTRO ?= ""
 PACKAGECONFIG_DEFAULT ?= "\
     accessibility \
+    ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'accessibility-atspi-bridge', '', d)} \
     dbus \
     fontconfig \
     glib \
@@ -72,6 +80,7 @@ PACKAGECONFIG_DEFAULT ?= "\
     jpeg \
     libinput \
     ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'use-gold-linker', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', 'use-lld-linker', '', d)} \
     openssl  \
     png \
     udev \
@@ -80,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"
@@ -90,18 +100,20 @@ BUILD_TYPE ?= "Release"
 OPENSSL_LINKING_MODE ?= "runtime"
 
 # Default platform plugin
-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)}"
+QT_QPA_DEFAULT_PLATFORM ?= "\
+${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-egl', \
+    bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', \
+        bb.utils.contains('PACKAGECONFIG', 'eglfs', 'eglfs', \
+         'linuxfb', d), d), 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"
-PACKAGECONFIG[developer-build] = "-DFEATURE_developer_build=ON,-DFEATURE_developer_build=OFF"
+PACKAGECONFIG[developer-build] = "-DFEATURE_developer_build=ON -DQT_BUILD_TESTS=OFF -DWARNINGS_ARE_ERRORS=OFF,-DFEATURE_developer_build=OFF"
 PACKAGECONFIG[use-gold-linker] = "-DFEATURE_use_gold_linker=ON"
 PACKAGECONFIG[use-bfd-linker] = "-DFEATURE_use_bfd_linker=ON"
+PACKAGECONFIG[use-lld-linker] = "-DFEATURE_use_lld_linker=ON"
 
 PACKAGECONFIG[cups] = "-DFEATURE_cups=ON,-DFEATURE_cups=OFF,cups"
 PACKAGECONFIG[dbus] = "-DFEATURE_dbus=ON,-DFEATURE_dbus=OFF,dbus"
@@ -114,20 +126,22 @@ PACKAGECONFIG[glib] = "-DFEATURE_glib=ON,-DFEATURE_glib=OFF,glib-2.0"
 PACKAGECONFIG[icu] = "-DFEATURE_icu=ON,-DFEATURE_icu=OFF,icu"
 PACKAGECONFIG[journald] = "-DFEATURE_journald=ON,-DFEATURE_journald=OFF,systemd"
 PACKAGECONFIG[lttng] = "-DFEATURE_lttng=ON,-DFEATURE_lttng=OFF,lttng-ust"
+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"
@@ -135,6 +149,8 @@ PACKAGECONFIG[no-opengl] = "-DINPUT_opengl=no"
 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"
 
@@ -165,10 +181,13 @@ EXTRA_OECMAKE:append:class-target = "\
     -DFEATURE_rpath=OFF \
     -DFEATURE_relocatable=OFF \
     -DQT_QPA_DEFAULT_PLATFORM=${QT_QPA_DEFAULT_PLATFORM} \
+    -DQT_NO_GENERATE_QMAKE_WRAPPER_FOR_TARGET=ON \
 "
 
 EXTRA_OECMAKE:append:mingw32 = "\
     -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON \
+    -DFEATURE_stack_protector=OFF \
+    -DFEATURE_dnslookup=OFF \
 "
 
 SYSROOT_DIRS += "${QT6_INSTALL_MKSPECSDIR}"
@@ -187,6 +206,11 @@ do_install:append() {
     rm -f ${D}${QT6_INSTALL_MKSPECSDIR}/features/uikit/device_destinations.sh
     rm -f ${D}${QT6_INSTALL_MKSPECSDIR}/features/data/mac/objc_namespace.sh
 
+    if [ -e ${D}${QT6_INSTALL_EXAMPLESDIR}/corelib/serialization/cbordump/cbortag.py ]; then
+        sed -i ${D}${QT6_INSTALL_EXAMPLESDIR}/corelib/serialization/cbordump/cbortag.py \
+            -e 's|/bin/env|/usr/bin/env|'
+    fi
+
     # remove unneeded files that contains reference to TMPDIR [buildpaths]
     rm -f ${D}${QT6_INSTALL_BINDIR}/host-*
     rm -f ${D}${QT6_INSTALL_BINDIR}/target_qt.conf
@@ -194,13 +218,16 @@ do_install:append() {
     install -d ${D}${datadir}/cmake/OEToolchainConfig.cmake.d
     RELPATH=${@os.path.relpath(d.getVar('prefix'), d.getVar('datadir') + '/cmake/OEToolchainConfig.cmake.d')}
     cat > ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/OEQt6Toolchain.cmake <<EOF
-get_filename_component(QT_HOST_PATH "\${CMAKE_CURRENT_LIST_DIR}/${RELPATH}" ABSOLUTE CACHE)
+get_filename_component(QT_HOST_PATH "\${CMAKE_CURRENT_LIST_DIR}/$RELPATH" ABSOLUTE CACHE)
 set(QT_BUILD_INTERNALS_NO_FORCE_SET_INSTALL_PREFIX ON CACHE BOOL "")
 EOF
 
     RELPATH="${@os.path.relpath(d.getVar('bindir'), d.getVar('QT6_INSTALL_BINDIR'))}"
     sed -i ${D}${QT6_INSTALL_BINDIR}/* \
-        -i ${D}${QT6_INSTALL_LIBEXECDIR}/* \
+        -e "s|cmake_path=${RECIPE_SYSROOT_NATIVE}.*cmake|cmake_path=%script_dir_path%/$RELPATH/cmake.exe|" \
+        -e "s|${RECIPE_SYSROOT_NATIVE}.*cmake|\$script_dir_path/$RELPATH/cmake|"
+    RELPATH="${@os.path.relpath(d.getVar('bindir'), d.getVar('QT6_INSTALL_LIBEXECDIR'))}"
+    sed -i ${D}${QT6_INSTALL_LIBEXECDIR}/* \
         -e "s|cmake_path=${RECIPE_SYSROOT_NATIVE}.*cmake|cmake_path=%script_dir_path%/$RELPATH/cmake.exe|" \
         -e "s|${RECIPE_SYSROOT_NATIVE}.*cmake|\$script_dir_path/$RELPATH/cmake|"
 
@@ -231,6 +258,11 @@ isEmpty(QMAKE_CC): {
 EOF
 }
 
+FILES:${PN}-dev += "\
+    ${datadir}/qt6/wayland \
+    ${datadir}/qt6/json_schema \
+"
+
 INSANE_SKIP:${PN}-ptest += "arch"
 INHIBIT_PACKAGE_STRIP_FILES = "\
     ${PKGD}${PTEST_PATH}/tests/auto/corelib/plugin/qpluginloader/elftest/corrupt2.elf64.so \

recipes-qt/qt6/qtcanvaspainter-examples_git.bb

@@ -0,0 +1,21 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtcanvaspainter"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS = "\
+    qtcanvaspainter \
+    qtcanvaspainter-native \
+    qtdeclarative \
+    qtdeclarative-native \
+    qtshadertools \
+    qtshadertools-native \
+"

recipes-qt/qt6/qtcanvaspainter_git.bb

@@ -0,0 +1,25 @@
+LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GFDL-1.3-no-invariants-only & BSD-3-Clause) & Zlib"
+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://LICENSES/Zlib.txt;md5=370cf821bfe014e4427629dab445adcf \
+"
+
+inherit qt6-cmake
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6.inc
+
+DEPENDS = "\
+    qtbase \
+    qtcanvaspainter-native \
+    qtdeclarative \
+    qtdeclarative-native \
+    qtshadertools \
+    qtshadertools-native \
+"
+
+BBCLASSEXTEND = "native nativesdk"

recipes-qt/qt6/qtcharts-examples_git.bb

@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtcharts"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtcharts \
+    qtdeclarative-native \
+    qtmultimedia \
+"

recipes-qt/qt6/qtcharts_git.bb

@@ -1,9 +1,8 @@
-LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GFDL-1.3-no-invariants-only"
+LICENSE = "The-Qt-Company-Commercial | GPL-3.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-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
-    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
 "
 
 inherit qt6-cmake

recipes-qt/qt6/qtcoap-examples_git.bb

@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtcoap"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtcoap \
+    qtdeclarative \
+    qtdeclarative-native \
+"

recipes-qt/qt6/qtcoap_git.bb

@@ -13,6 +13,3 @@ include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
-
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtdeclarative-native"
-

recipes-qt/qt6/qtconnectivity-examples_git.bb

@@ -0,0 +1,19 @@
+LICENSE = "(The-Qt-Company-Commercial | BSD-3-Clause) & Apache-2.0"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/Apache-2.0.txt;md5=b4c615f64dff32f71eeed614d13dfd4c \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtconnectivity"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtconnectivity \
+    qtdeclarative \
+    qtdeclarative-native \
+"

recipes-qt/qt6/qtconnectivity_git.bb

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

recipes-qt/qt6/qtdatavis3d-examples_git.bb

@@ -0,0 +1,20 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+inherit features_check
+
+REQUIRED_DISTRO_FEATURES = "opengl"
+
+QT_MODULE = "qtdatavis3d"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdatavis3d \
+    qtdeclarative-native \
+"

recipes-qt/qt6/qtdatavis3d_git.bb

@@ -6,9 +6,11 @@ LIC_FILES_CHKSUM = " \
     file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
 "
 
-inherit qt6-cmake
+inherit qt6-cmake features_check
 
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
+REQUIRED_DISTRO_FEATURES = "opengl"
+
 DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

recipes-qt/qt6/qtdeclarative-examples_git.bb

@@ -0,0 +1,21 @@
+LICENSE = "(The-Qt-Company-Commercial | BSD-3-Clause) & Apache-2.0 & CC-BY-3.0 & MIT & OFL-1.1"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/Apache-2.0.txt;md5=b4c615f64dff32f71eeed614d13dfd4c \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/CC-BY-3.0.txt;md5=6dffb34dbf23fffe10cc646d9c030e14 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/MIT.txt;md5=3605d54ecceddcd50962eb89318779ec \
+    file://LICENSES/OFL-1.1.txt;md5=e0e18125674e1542f95ea36a4a958f57 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtdeclarative"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative \
+    qtdeclarative-native \
+"

recipes-qt/qt6/qtdeclarative_git.bb

@@ -15,9 +15,8 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 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"
+DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native qtlanguageserver qtsvg"
 
 BBCLASSEXTEND = "native nativesdk"
 
+INSANE_SKIP:${PN}-ptest += "buildpaths"

recipes-qt/qt6/qtdeviceutilities-examples_git.bb

@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtdeviceutilities"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtdeviceutilities \
+"
+RDEPENDS:${PN} = "qtvirtualkeyboard"

recipes-qt/qt6/qtdeviceutilities_git.bb

@@ -1,10 +1,18 @@
-LICENSE = "GPL-3.0-only | The-Qt-Company-Commercial"
-LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
+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"
+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 \
+    "
 
 inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtvirtualkeyboard"
+DEPENDS = "qtbase qtdeclarative qtdeclarative-native"
 RDEPENDS:${PN} = "connman"
 

recipes-qt/qt6/qtdoc-examples_git.bb

@@ -0,0 +1,44 @@
+LICENSE = "(The-Qt-Company-Commercial | BSD-3-Clause) & Apache-2.0 & CC-BY-4.0 & CC-BY-SA-4.0 & ISC"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/Apache-2.0.txt;md5=b4c615f64dff32f71eeed614d13dfd4c \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/CC-BY-4.0.txt;md5=ed88d31cea57b15030a1f58ceb04e0d5 \
+    file://LICENSES/CC-BY-SA-4.0.txt;md5=7130783469368ceb248a4f03e89ea4b8 \
+    file://LICENSES/ISC.txt;md5=2494cdbaca137fd93842fe9702e9bc4d \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=caa060942f6b722bc4329d4195584c38 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtdoc"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtbase \
+    qtcharts \
+    qtdeclarative \
+    qtdeclarative-native \
+    qtdoc \
+    qtgraphs \
+    qtlocation \
+    qtmultimedia \
+    qtpositioning \
+    qtquick3d \
+    qtquick3d-native \
+    qtsensors \
+    qtshadertools-native \
+    qtsvg \
+    qttools \
+    qttools-native \
+    qtwebsockets \
+"
+DEPENDS:append:aarch64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} qtquick3dphysics"
+DEPENDS:append:arm = " qtquick3dphysics"
+DEPENDS:append:armv6 = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)}"
+DEPENDS:append:armv7a = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)}"
+DEPENDS:append:armv7ve = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)}"
+DEPENDS:append:x86 = " qtquick3dphysics"
+DEPENDS:append:x86-64 = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} qtquick3dphysics"
+DEPENDS:remove:libc-musl = "qtpdf"

recipes-qt/qt6/qtdoc_git.bb

@@ -0,0 +1,23 @@
+LICENSE = "The-Qt-Company-Commercial | (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause"
+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=caa060942f6b722bc4329d4195584c38 \
+"
+
+inherit qt6-cmake
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6.inc
+
+DEPENDS = "\
+    qtbase \
+    qtdeclarative \
+    qtdeclarative-native \
+    qttasktree \
+"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"

recipes-qt/qt6/qtgraphs-examples_git.bb

@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtgraphs"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtgraphs \
+    qtquick3d-native \
+"

recipes-qt/qt6/qtgrpc-examples_git.bb

@@ -0,0 +1,22 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtgrpc"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    grpc \
+    grpc-native \
+    qtdeclarative-native \
+    qtgrpc \
+    qtgrpc-native \
+"
+
+INSANE_SKIP:${PN} += "buildpaths"

recipes-qt/qt6/qtgrpc_git.bb

@@ -15,6 +15,9 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtgrpc-native protobuf protobuf-native"
 
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtdeclarative-native"
+PACKAGECONFIG ?= "qml"
+PACKAGECONFIG[qml] = "-DFEATURE_grpcquick=ON,-DFEATURE_grpcquick=OFF,qtdeclarative qtdeclarative-native"
 
 BBCLASSEXTEND = "native nativesdk"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"

recipes-qt/qt6/qthttpserver-examples_git.bb

@@ -0,0 +1,14 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qthttpserver"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "qthttpserver"

recipes-qt/qt6/qthttpserver_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"
+LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only & BSD-3-Clause"
 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 \
 "
 
 inherit qt6-cmake

recipes-qt/qt6/qtimageformats_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 | GPL-3.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
@@ -15,7 +14,7 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-PACKAGECONFIG ?= "tiff webp"
+PACKAGECONFIG ?= "jasper mng tiff webp"
 PACKAGECONFIG[jasper] = "-DFEATURE_jasper=ON,-DFEATURE_jasper=OFF,jasper"
 PACKAGECONFIG[mng] = "-DFEATURE_mng=ON,-DFEATURE_mng=OFF,libmng"
 PACKAGECONFIG[tiff] = "-DFEATURE_tiff=ON,-DFEATURE_libtiff=OFF,tiff"

recipes-qt/qt6/qtinsighttracker-examples_git.bb

@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtinsighttracker"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+include recipes-qt/qt6/qt6-commercial.inc
+
+DEPENDS = "\
+    qtdeclarative-native \
+    qtinsighttracker \
+"

recipes-qt/qt6/qtinterfaceframework-examples_git.bb

@@ -0,0 +1,21 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtinterfaceframework"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtinterfaceframework \
+    qtinterfaceframework-native \
+    qtremoteobjects-native \
+"
+
+PRIVATE_LIBS:${PN} = "libInstrumentCluster.so"

recipes-qt/qt6/qtinterfaceframework.inc

@@ -1,35 +0,0 @@
-inherit systemd
-
-SRC_URI += " \
-    file://ifmedia-simulation-server.service \
-    file://ifvehiclefunctions-simulation-server.service \
-    file://if-services.target \
-    file://simulation-server.conf \
-"
-
-do_install:append:class-target() {
-    install -m 0755 -d ${D}${systemd_unitdir}/system
-    install -m 0644 ${WORKDIR}/ifmedia-simulation-server.service ${D}${systemd_unitdir}/system/
-    install -m 0644 ${WORKDIR}/ifvehiclefunctions-simulation-server.service ${D}${systemd_unitdir}/system/
-    install -m 0644 ${WORKDIR}/if-services.target ${D}${systemd_unitdir}/system/
-
-    install -m 0755 -d ${D}${sysconfdir}
-    install -m 0755 ${WORKDIR}/simulation-server.conf ${D}${sysconfdir}/
-}
-
-SYSTEMD_PACKAGES = "${PN}-simulation"
-SYSTEMD_SERVICE:${PN}-simulation = " \
-    ifmedia-simulation-server.service \
-    ifvehiclefunctions-simulation-server.service \
-    if-services.target \
-    "
-
-PACKAGE_BEFORE_PN =+ "${PN}-simulation"
-FILES:${PN}-simulation = " \
-    ${QT6_INSTALL_BINDIR}/ifmedia-simulation-server \
-    ${QT6_INSTALL_BINDIR}/ifvehiclefunctions-simulation-server \
-    ${QT6_INSTALL_PLUGINSDIR}/interfaceframework/ \
-    ${systemd_unitdir}/system \
-    ${sysconfdir}/simulation-server.conf \
-    "
-RRECOMMENDS:${PN} += "${PN}-simulation"

recipes-qt/qt6/qtinterfaceframework/if-services.target

@@ -1,3 +0,0 @@
-[Unit]
-Description=Qt Interface Framework services
-After=systemd-user-sessions.service

recipes-qt/qt6/qtinterfaceframework/ifmedia-simulation-server.service

@@ -1,13 +0,0 @@
-[Unit]
-Description=ifmedia-simulation-server
-PartOf=if-services.target
-Before=if-services.target
-
-[Service]
-User=root
-ExecStart=/usr/bin/ifmedia-simulation-server
-Restart=on-failure
-Environment=SERVER_CONF_PATH=/etc/simulation-server.conf
-
-[Install]
-WantedBy=if-services.target

recipes-qt/qt6/qtinterfaceframework/ifvehiclefunctions-simulation-server.service

@@ -1,13 +0,0 @@
-[Unit]
-Description=ifvehiclefunctions-simulation-server
-PartOf=if-services.target
-Before=if-services.target
-
-[Service]
-User=root
-ExecStart=/usr/bin/ifvehiclefunctions-simulation-server
-Restart=on-failure
-Environment=SERVER_CONF_PATH=/etc/simulation-server.conf
-
-[Install]
-WantedBy=if-services.target

recipes-qt/qt6/qtinterfaceframework/simulation-server.conf

@@ -1,8 +0,0 @@
-[remotesettings]
-Registry=tcp://0.0.0.0:9999
-
-[drivedata]
-Registry=tcp://0.0.0.0:9998
-
-[qtifmedia]
-Registry=tcp://0.0.0.0:9997

recipes-qt/qt6/qtinterfaceframework_git.bb

@@ -13,58 +13,18 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-# Default build and package these
-REFERENCE_API ?= "1"
-SIMULATION_SUPPORT ?= "1"
-include ${@bb.utils.contains('SIMULATION_SUPPORT', '1', 'qtinterfaceframework.inc', '', d)}
-
 FILES:${PN}-dev += " \
     ${QT6_INSTALL_DATADIR}/ifcodegen-templates \
     "
 
-PACKAGE_BEFORE_PN =+ "${PN}-refapi-media"
-FILES:${PN}-refapi-media = "\
-    ${QT6_INSTALL_LIBDIR}/libQt6IfMedia.so.* \
-    ${QT6_INSTALL_LIBDIR}/qml/QtInterfaceFramework/Media \
-    "
-
-PACKAGE_BEFORE_PN =+ "${PN}-refapi-vehiclefuntions"
-FILES:${PN}-refapi-vehiclefuntions = "\
-    ${QT6_INSTALL_LIBDIR}/libQt6IfVehicleFunctions.so.* \
-    ${QT6_INSTALL_LIBDIR}/qml/QtInterfaceFramework/VehicleFunctions \
-    "
-
 DEPENDS += "qtbase qtdeclarative qtdeclarative-native qtinterfaceframework-native"
 
-PRIVATE_LIBS:${PN}-examples = "libInstrumentCluster.so"
+PACKAGECONFIG ?= "ifcodegen remoteobjects"
+PACKAGECONFIG:append:class-native = " host-tools-only"
+PACKAGECONFIG:append:class-nativesdk = " host-tools-only"
 
-PACKAGECONFIG ?= "ifcodegen remoteobjects interfaceframework \
-    ${PACKAGECONFIG_REFERENCE_API} \
-    ${PACKAGECONFIG_SIMULATION} \
-    "
-
-PACKAGECONFIG[taglib] = "-DFEATURE_taglib=ON,-DFEATURE_taglib=OFF,taglib"
 PACKAGECONFIG[host-tools-only] = "-DFEATURE_host_tools_only=ON,-DFEATURE_host_tools_only=OFF"
 PACKAGECONFIG[ifcodegen] = "-DFEATURE_ifcodegen=ON,-DFEATURE_ifcodegen=OFF,python3-qface,python3-qface"
 PACKAGECONFIG[remoteobjects] = "-DFEATURE_remoteobjects=ON,-DFEATURE_remoteobjects=OFF,qtremoteobjects qtremoteobjects-native"
 
-#interfaceframework only
-PACKAGECONFIG[interfaceframework] = "-DFEATURE_interfaceframework=ON,-DFEATURE_interfaceframework=OFF"
-
-# reference API's
-PACKAGECONFIG[ifmedia] = "-DFEATURE_ifmedia=ON,-DFEATURE_ifmedia=OFF,qtmultimedia"
-PACKAGECONFIG[ifvehiclefunctions] = "-DFEATURE_ifvehiclefunctions=ON,-DFEATURE_ifvehiclefunctions=OFF"
-
-PACKAGECONFIG_REFERENCE_API ?= "${@bb.utils.contains('REFERENCE_API', '1', 'ifvehiclefunctions ifmedia taglib', '', d)}"
-
-# simulation support
-PACKAGECONFIG[no-media-simulation] = "-DFEATURE_media_qtro_backend=OFF -DFEATURE_media_qtro_simulation_server=OFF -DFEATURE_media_simulation_backend=OFF -DFEATURE_tuner_simulation_backend=OFF"
-PACKAGECONFIG[no-vehiclefuntions-simulation] = "-DFEATURE_vehiclefunctions_qtro_backend=OFF -DFEATURE_vehiclefunctions_qtro_simulation_server=OFF -DFEATURE_vehiclefunctions_simulation_backend=OFF"
-
-PACKAGECONFIG_SIMULATION ?= "${@bb.utils.contains('SIMULATION_SUPPORT', '1', '', 'no-media-simulation no-vehiclefuntions-simulation', d)}"
-
-PACKAGECONFIG:class-native ??= "interfaceframework ifcodegen host-tools-only remoteobjects"
-PACKAGECONFIG:class-nativesdk ??= "${PACKAGECONFIG:class-native}"
-
 BBCLASSEXTEND = "native nativesdk"
-

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
@@ -16,3 +15,5 @@ include recipes-qt/qt6/qt6.inc
 DEPENDS += "qtbase"
 
 BBCLASSEXTEND = "native nativesdk"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"

recipes-qt/qt6/qtlocation-examples_git.bb

@@ -0,0 +1,17 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtlocation"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtlocation \
+"

recipes-qt/qt6/qtlocation_git.bb

@@ -1,10 +1,12 @@
-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"
+LICENSE = "(The-Qt-Company-Commercial | GPL-3.0-only & (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://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+    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/MIT.txt;md5=3605d54ecceddcd50962eb89318779ec \
 "
 
 inherit qt6-cmake
@@ -20,3 +22,5 @@ PACKAGECONFIG[mapbox] = "-DFEATURE_geoservices_mapbox=ON,-DFEATURE_geoservices_m
 PACKAGECONFIG[nokia] = "-DFEATURE_geoservices_nokia=ON,-DFEATURE_geoservices_nokia=OFF,"
 PACKAGECONFIG[osm] = "-DFEATURE_geoservices_osm=ON,-DFEATURE_geoservices_osm=OFF,"
 PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"

recipes-qt/qt6/qtlottie_git.bb

@@ -1,9 +1,8 @@
-LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GFDL-1.3-no-invariants-only"
+LICENSE = "The-Qt-Company-Commercial | GPL-3.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-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
-    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
 "
 
 inherit qt6-cmake
@@ -11,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/qtmqtt-examples_git.bb

@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtmqtt"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtmqtt \
+    qtwebsockets \
+"

recipes-qt/qt6/qtmqtt_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"
+LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only & BSD-3-Clause"
 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 \
 "
 
 inherit qt6-cmake
@@ -13,6 +12,3 @@ include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
-
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtdeclarative-native qtwebsockets"
-

recipes-qt/qt6/qtmultimedia-examples_git.bb

@@ -0,0 +1,18 @@
+LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+QT_MODULE = "qtmultimedia"
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-examples.inc
+
+DEPENDS += "\
+    qtdeclarative-native \
+    qtmultimedia \
+    qtsvg \
+"