Update submodule refs on 'lts-6.5.6' in yocto/meta-qt6

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

README.md

@@ -16,30 +16,21 @@ 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 releases which are used to test each
+Following table shows the Yocto branches which are used to test each
 Qt version (x) and any additional Yocto releases that are stated in
 the LAYERSERIES_COMPAT (c).
 
-| Yocto \ Qt | dev | 6.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
+| Yocto \ Qt | 6.5 | 6.4 | 6.3 | 6.2 |
+| ---------- |:---:|:---:|:---:|:---:|
+| scarthgap  |  x  |     |     |     |
+| nanbield   |  x  |     |     |     |
+| mickledore |  c  |  x  |     |     |
+| langdale   |  c  |  x  |     |     |
+| kirkstone  |  x  |  x  |  x  |  x  |
+| honister   |  c  |  c  |  x  |  x  |
+| hardknott  |  c  |  c  |  c  |  c  |
+| gatesgarth |  c  |  c  |  c  |  c  |
+| dunfell    |  x  |  x  |  x  |  x  |
 
 Commercial Qt
 -------------
@@ -60,6 +51,12 @@ 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

@@ -1,26 +0,0 @@
-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,7 +1,5 @@
 inherit qt6-paths
 
-SDKIMAGE_FEATURES:append = " staticdev-pkgs"
-
 SDK_POSTPROCESS_COMMAND:prepend = "create_qt6_sdk_files;"
 
 EXE_EXT = ""
@@ -27,7 +25,7 @@ create_qt6_sdk_files () {
     echo 'Binaries = ${QT6_INSTALL_BINDIR}' >> $qtconf
     echo 'LibraryExecutables = ${QT6_INSTALL_LIBEXECDIR}' >> $qtconf
     echo 'Plugins = ${QT6_INSTALL_PLUGINSDIR}' >> $qtconf
-    echo 'QmlImports = ${QT6_INSTALL_QMLDIR}' >> $qtconf
+    echo 'Qml2Imports = ${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,11 +9,9 @@ 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 = "\
@@ -41,21 +39,10 @@ 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 '\|${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
+               -e '/QMAKE_PRL_BUILD_DIR/d' {} \;
 }
 
 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 [ARCHDATADIR/modules]
-QT6_INSTALL_DESCRIPTIONSDIR ?= "${libdir}/modules"
+# Module description files directory [DATADIR/modules]
+QT6_INSTALL_DESCRIPTIONSDIR ?= "${datadir}/modules"
 # Mkspecs files [PREFIX/mkspecs]
 QT6_INSTALL_MKSPECSDIR ?= "${libdir}/mkspecs"

classes/qt6-qmake.bbclass

@@ -12,12 +12,13 @@ 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 = "${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'))))}"
+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}"
 
 # This is useful for target recipes to reference native mkspecs
 QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}"
@@ -62,7 +63,7 @@ EXTRA_OEMAKE = " \
     OE_QMAKE_INCDIR_QT='${STAGING_DIR_TARGET}/${OE_QMAKE_PATH_HEADERS}' \
 "
 
-OE_QMAKE_QMAKE = "${OE_QMAKE_PATH_HOST_BINS}/qmake"
+OE_QMAKE_QMAKE = "${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake"
 export OE_QMAKE_CC = "${CC}"
 export OE_QMAKE_CFLAGS = "${CFLAGS}"
 export OE_QMAKE_CXX = "${CXX}"
@@ -79,7 +80,40 @@ 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}
@@ -90,24 +124,34 @@ Data = ${OE_QMAKE_PATH_DATA}
 Binaries = ${OE_QMAKE_PATH_BINS}
 LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}
 Plugins = ${OE_QMAKE_PATH_PLUGINS}
-QmlImports = ${OE_QMAKE_PATH_QML}
+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}
-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.
@@ -118,7 +162,7 @@ EOF
 # Binaries The location of installed Qt binaries (tools and applications).
 # Plugins The location of installed Qt plugins.
 # Imports The location of installed QML extensions to import (QML 1.x).
-# QmlImports The location of installed QML extensions to import (QML 2.x).
+# Qml2Imports 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.
@@ -131,6 +175,7 @@ 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

@@ -2,7 +2,7 @@ python do_srcrev_update() {
     import subprocess
 
     recipe = d.getVar('FILE')
-    srcrev_file = os.path.join(d.getVar('QT6BASE'), 'recipes-qt/qt6/qt6-git.inc')
+    srcrev_file = os.path.join(os.path.dirname(recipe), 'qt6-git.inc')
 
     module = d.getVar('QT_MODULE')
 
@@ -20,21 +20,18 @@ python do_srcrev_update() {
     d.setVar("__BBSRCREV_SEEN", "1")
     for scm in scms:
         ud = urldata[scm]
-        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")
+        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 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

@@ -1,22 +0,0 @@
-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, TARGET6, TARGET7]
+      in_values: [TARGET1, TARGET2, TARGET3, TARGET4, TARGET5]
 
 machine_type:
   Build:
@@ -15,15 +15,13 @@ machine_type:
 
 # Target build matrix:
 #
-#             [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]       [target2]   [target3]       [target4]       [target5]
+# [machine] qemuarm64       qemux86     qemuarm         qemux86-64      qemuarm64
+# [yocto]   nanbield        scarthgap   scarthgap       dunfell         kirkstone
+# [X11]     no              no          yes             yes             no
+# [mingw]   no              yes         no              no              no
+# [static]  no              no          no              no              yes
+#
 
 target1: &target1
   type: Group
@@ -33,13 +31,10 @@ target1: &target1
       variableValue: qemuarm64
     - type: EnvironmentVariable
       variableName: MANIFEST
-      variableValue: master.xml
+      variableValue: nanbield.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs wayland opengl
-    - type: EnvironmentVariable
-      variableName: CHECK_COMPATIBILITY
-      variableValue: 1
+      variableValue: ci configs wayland
   enable_if:
       condition: property
       property: target.arch
@@ -49,13 +44,13 @@ target2: &target2
   instructions:
     - type: EnvironmentVariable
       variableName: MACHINE
-      variableValue: qemux86-64
+      variableValue: qemux86
     - type: EnvironmentVariable
       variableName: MANIFEST
-      variableValue: walnascar.xml
+      variableValue: scarthgap.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs x11 opengl
+      variableValue: ci configs wayland mingw no-webengine
   enable_if:
       condition: property
       property: target.arch
@@ -71,7 +66,7 @@ target3: &target3
       variableValue: scarthgap.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs mingw wayland x11 opengl
+      variableValue: ci configs
   enable_if:
       condition: property
       property: target.arch
@@ -81,13 +76,13 @@ target4: &target4
   instructions:
     - type: EnvironmentVariable
       variableName: MACHINE
-      variableValue: qemux86
+      variableValue: qemux86-64
     - type: EnvironmentVariable
       variableName: MANIFEST
-      variableValue: whinlatter.xml
+      variableValue: dunfell.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs wayland opengl
+      variableValue: ci configs dunfell no-webengine
   enable_if:
       condition: property
       property: target.arch
@@ -100,46 +95,14 @@ target5: &target5
       variableValue: qemuarm64
     - type: EnvironmentVariable
       variableName: MANIFEST
-      variableValue: scarthgap.xml
+      variableValue: kirkstone.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs wayland opengl static
+      variableValue: ci configs wayland static no-webengine
   enable_if:
       condition: property
       property: target.arch
       equals_value: TARGET5
-target6: &target6
-  type: Group
-  instructions:
-    - type: EnvironmentVariable
-      variableName: MACHINE
-      variableValue: qemuarm64
-    - type: EnvironmentVariable
-      variableName: MANIFEST
-      variableValue: master.xml
-    - type: EnvironmentVariable
-      variableName: TEST_CONFIGS
-      variableValue: ci configs x11
-  enable_if:
-      condition: property
-      property: target.arch
-      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:
@@ -148,8 +111,6 @@ instructions:
   - *target3
   - *target4
   - *target5
-  - *target6
-  - *target7
   - type: EnvironmentVariable
     variableName: DL_DIR
     variableValue: "/mnt/yocto-cache/downloads"
@@ -176,27 +137,14 @@ instructions:
       chmod +x repo
 
       ./repo init \
-          --repo-url git@git.qt.io:boot2qt/git-repo.git \
+          --repo-url https://github.com/theqtcompany/git-repo \
           -u git://code.qt.io/yocto/boot2qt-manifest \
           -b ci \
           -m ${MANIFEST} \
           --reference /mnt/yocto-cache/mirror
       ./repo sync
 
-      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
+      source ./poky/oe-init-build-env
       bitbake-layers add-layer ../meta-openembedded/meta-oe
       bitbake-layers add-layer ../meta-openembedded/meta-python
       bitbake-layers add-layer ../meta-openembedded/meta-multimedia
@@ -208,10 +156,7 @@ instructions:
       done
 
       # build toolchain which should include all supported recipes
-      bitbake meta-toolchain-qt6 \
-          nativesdk-packagegroup-qt6-toolchain-host \
-          packagegroup-qt6-modules \
-          packagegroup-qt6-examples
+      bitbake meta-toolchain-qt6 nativesdk-packagegroup-qt6-toolchain-host packagegroup-qt6-modules
     filename: "{{.BuildDir}}/start-build"
     fileMode: 420
   - type: ExecuteCommand

coin/test-clang.inc

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

coin/test-configs.inc

@@ -1,4 +1,3 @@
-DISTRO = "poky"
 # use systemd
 INIT_MANAGER:forcevariable = "systemd"
 
@@ -32,25 +31,68 @@ 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}"
 
 # enable webengine with commercial/proprietary features
+DISTRO_FEATURES:append = " webengine"
 PACKAGECONFIG:append:pn-qtwebengine = " proprietary-codecs"
 
 PACKAGECONFIG:append:pn-qtbase = "\
-    tslib libproxy gssapi mtdev cups ctf \
+    tslib kms gbm zstd libproxy gssapi vulkan mtdev cups \
     sql-mysql sql-odbc sql-psql sql-sqlite journald brotli \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
+    use-gold-linker \
 "
 
-RDEPENDS:${PN}:append:pn-packagegroup-qt6-modules = " packagegroup-qt6-examples"
+# imageformats mng FIXME
+PACKAGECONFIG:append:pn-qtimageformats = " jasper"
 
-# remove all main features, added back in different builds
-POKY_DEFAULT_DISTRO_FEATURES:remove = "opengl wayland vulkan"
-DISTRO_FEATURES_DEFAULT:remove = "x11"
+# 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-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"

coin/test-dunfell.inc

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

coin/test-no-webengine.inc

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

coin/test-opengl.inc

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

coin/test-ptest.inc

@@ -1,51 +0,0 @@
-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-static.inc

@@ -1,5 +1,2 @@
 PACKAGECONFIG:append:pn-qtbase = " static"
 QT_PTEST_ENABLED = "0"
-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 +1,2 @@
+DISTRO_FEATURES:remove = "x11"
 DISTRO_FEATURES:append = " wayland"

coin/test-x11.inc

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

conf/layer.conf

@@ -18,6 +18,7 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 BBFILES_DYNAMIC += " \
     meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bb \
     meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bbappend \
+    openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes*/*/*.bbappend \
 "
 
 BBFILE_COLLECTIONS += "qt6-layer"
@@ -35,20 +36,22 @@ LAYERVERSION_qt6-layer = "1"
 
 LAYERDEPENDS_qt6-layer = "core openembedded-layer meta-python"
 
-LAYERSERIES_COMPAT_qt6-layer = "scarthgap styhead walnascar whinlatter"
+LAYERSERIES_COMPAT_qt6-layer = "dunfell gatesgarth hardknott honister kirkstone langdale mickledore nanbield scarthgap"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
-# Set a variable to get to the top of the metadata location
-QT6BASE := "${LAYERDIR}"
+IMAGE_FEATURES[validitems] += "qtcreator-debug"
 
 QT_GIT_PROJECT ?= "qt"
 QT_GIT ?= "git://code.qt.io"
 QT_GIT_PROTOCOL ?= "git"
 QT_EDITION ?= "opensource"
-QT_VERSION = "6.11.0"
+QT_VERSION = "6.5.6"
 
 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

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

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

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

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

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

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

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;subdir=${BP};striplevel=1"
+SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/zlib/${PV}/zlib-${PV}.tar.xz"
 UPSTREAM_CHECK_URI = "http://zlib.net/"
 
-S .= "/contrib/minizip"
+S = "${WORKDIR}/zlib-${PV}/contrib/minizip"
 
 SRC_URI[md5sum] = "85adef240c5f370b308da8c938951a68"
 SRC_URI[sha256sum] = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"

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

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

recipes-devtools/python/python3-pytest-qt_4.0.2.bb

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

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

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

@@ -11,22 +11,18 @@ 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,9 +9,7 @@ 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)} \
@@ -20,6 +18,8 @@ RDEPENDS:${PN} += " \
 
 FORLINUXHOST:mingw32 = ""
 FORLINUXHOST = " \
+    nativesdk-cmake \
+    nativesdk-ninja \
     nativesdk-perl-modules \
     nativesdk-python3-html5lib \
 "

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

@@ -11,14 +11,11 @@ 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 \
     qtimageformats \
@@ -42,7 +39,6 @@ RDEPENDS:${PN} += " \
     qtshadertools \
     qtspeech \
     qtsvg \
-    qttasktree \
     qttranslations \
     qtvirtualkeyboard \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
@@ -52,27 +48,20 @@ RDEPENDS:${PN} += " \
 
 RDEPENDS:${PN}:append:aarch64 = "\
     qtquick3dphysics \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
 "
 RDEPENDS:${PN}:append:arm = " qtquick3dphysics"
 RDEPENDS:${PN}:append:armv6 = "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
 "
 RDEPENDS:${PN}:append:armv7a = "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
 "
 RDEPENDS:${PN}:append:armv7ve = "\
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
 "
 RDEPENDS:${PN}:append:x86 = " qtquick3dphysics"
 RDEPENDS:${PN}:append:x86-64 = "\
     qtquick3dphysics \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview qtpdf', '', d)} \
 "
-
-RDEPENDS:${PN}:remove:libc-musl = "qtpdf qtwebengine qtwebview"

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

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

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

@@ -1,84 +0,0 @@
-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,7 +4,6 @@ inherit linuxloader
 inherit qemu
 
 COMPATIBLE_MACHINE = "(-)"
-COMPATIBLE_MACHINE:libc-musl = "(-)"
 COMPATIBLE_MACHINE:aarch64 = "(.*)"
 COMPATIBLE_MACHINE:armv6 = "(.*)"
 COMPATIBLE_MACHINE:armv7a = "(.*)"
@@ -44,10 +43,6 @@ 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

@@ -0,0 +1,52 @@
+# 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,24 +46,6 @@ 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
@@ -86,17 +68,14 @@ def write_toolchain_file(d, file_path):
         '  toolchain_args = {\n'
         '    current_cpu = "${current_cpu}"\n'
         '    current_os = "linux"\n'
-        '    is_clang = ${is_clang}\n'
-        '    host_pkg_config = "${host_pkg_config}"\n'
+        '    is_clang = false\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}'),
@@ -109,9 +88,7 @@ def write_toolchain_file(d, file_path):
     }
     target_toolchain = {
         'toolchain_name': 'yocto_target',
-        'is_clang': gn_clang(d),
         'current_cpu': gn_target_arch_name(d),
-        'host_pkg_config': gn_host_pkg_config(d),
         'cc': d.expand('${CC}'),
         'cxx': d.expand('${CXX}'),
         'ar': d.expand('${AR}'),

recipes-qt/qt6/ptest/run-ptest

@@ -1,26 +1,12 @@
 #!/bin/sh
 
-if [ ! -s tst_list ]; then
+if [ ! -e tst_list ]; then
     echo PASS: no tests
     exit 0
 fi
 
-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
-
+export LANG=C.UTF-8
+export QT_QPA_PLATFORM=offscreen
 for test in $(cat tst_list); do
     (
     cd $(dirname ${test})

recipes-qt/qt6/qmlcompilerplus_git.bb

@@ -1,8 +1,6 @@
 LICENSE = "The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
-    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 \
+    file://src/qmlcompilerplus/cppcodegen_p.h;endline=27;md5=6a1dccd03d0d5864357e72b67def8ff2 \
 "
 
 inherit qt6-cmake

recipes-qt/qt6/qt3d-examples_git.bb

@@ -1,23 +0,0 @@
-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=875a54e93593c8b244ef6b78cacc336e \
+    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 \
 "
 
 inherit qt6-cmake
@@ -19,17 +19,15 @@ inherit features_check
 REQUIRED_DISTRO_FEATURES = "opengl"
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 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=${BB_GIT_DEFAULT_DESTSUFFIX}/src/3rdparty/assimp/src \
+    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qt3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/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

@@ -1,14 +0,0 @@
-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,12 +7,13 @@ 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/LICENSE.QTSCIICODEC.txt;md5=f36a16de69d08da0af83ce2a672d8972 \
+    file://src/core5/codecs/QTSCIICODEC_LICENSE.txt;md5=f36a16de69d08da0af83ce2a672d8972 \
 "
 
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 ENABLE_QMLCOMPILER = "0"

recipes-qt/qt6/qt6-commercial.inc

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

recipes-qt/qt6/qt6-examples.inc

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

@@ -1,75 +1,68 @@
 DESCRIPTION ?= "Qt is a cross-platform application development framework for desktop, embedded and mobile."
 HOMEPAGE ?= "https://www.qt.io"
 
-inherit srcrev-update
-
 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "dev"
+QT_MODULE_BRANCH ?= "6.5"
 QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
-QT_MODULE_REPO ?= "${QT_MODULE}"
+QT_MODULE_REPO ?= "${QT_MODULE}.git"
 
-# for compatibility with Yocto releases before whinlatter
-BB_GIT_DEFAULT_DESTSUFFIX ?= "${BP}"
+SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}"
 
-SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}"
+CVE_PRODUCT:append = " qt"
 
-CVE_PRODUCT ?= "qt:${BPN} qt:qt"
+S = "${WORKDIR}/git"
 
 PV = "${QT_VERSION}"
 
-SRCREV = "${SRCREV_${QT_MODULE_REPO}}"
+SRCREV = "${SRCREV_${QT_MODULE}}"
 
-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"
+SRCREV_tqtc-qmlcompilerplus = "83bf4928c1c356c5e0e804cb723db1c75e07aff7"
+SRCREV_tqtc-qtinsighttracker = "34595fbd124db003a6179aee1b0a5ed4d02f5eb2"
+SRCREV_tqtc-qtvncserver = "ed2b113e7ee83f0d3a53090f82da84676413bb4e"
+SRCREV_qt3d = "b1d3dd19e8ac70a861edb5bd47011ce819aa1fae"
+SRCREV_qt3d-assimp = "c60a259fd35f09b8896b2920d48c436145914aae"
+SRCREV_qt5compat = "27774c1d2058bdd951cfc827d52dc68dc811c9a2"
+SRCREV_qtbase = "72e405b9079707c9c033864aa66d20221b54bb06"
+SRCREV_qtapplicationmanager = "3f77fdaa83f7fc7db7427ffe37f445e91c8ee1be"
+SRCREV_qtcharts = "29465c58b158b2200d6577d2cb6bb0e972154020"
+SRCREV_qtcoap = "ebc6c174a59ba201e0467a206b5e543e94d30e8f"
+SRCREV_qtconnectivity = "dd971dfb95970195d926371c8603d98d75a03d56"
+SRCREV_qtdatavis3d = "c18392fd799eadc3110747b0fbb5fe843b3df402"
+SRCREV_qtdeclarative = "0bbb1c4e12e7d027b452a946652049f353a41132"
+SRCREV_qtdeviceutilities = "7502c8cb156a68b0576cf575a9a161cdade005a3"
+SRCREV_qtgrpc = "ac96ecc6e70f8ac58a1949fa5a14c01c419ca32a"
+SRCREV_qthttpserver = "cf82ce3bdfff366cf6be17da0da65d8131d6c258"
+SRCREV_qtimageformats = "0fbd8beca9e19f73507d5d35be5a876600d2eff1"
+SRCREV_qtinterfaceframework = "05c800b4d1a427843846f2de5a7e693dae5c4e08"
+SRCREV_qtlanguageserver = "4d1dde2d72407f6e5f725efd6cee86951c006e19"
+SRCREV_qtlocation = "2d4d23684110e251294798bd722d5e6dc32f6845"
+SRCREV_qtlottie = "ef4f2a27a9a919e9b6a44c7f6999996a2b90d532"
+SRCREV_qtmqtt = "21177fbcc2051a0d611ed0773b3d479c3a858dd2"
+SRCREV_qtmultimedia = "d842fea8622aa8825ba42f1263c7aacc24ae5631"
+SRCREV_qtnetworkauth = "dd69dcecf0122c5e677ba8dea869b340fec25fba"
+SRCREV_qtopcua = "16208fbf20da782b101f87eeb897b984b2d492ad"
+SRCREV_qtpositioning = "384e6155a739c96be5f07a29ac4953463405d960"
+SRCREV_qtquick3d = "c8207abe652b4dbe3a7837e63f1be91980d36086"
+SRCREV_qtquick3d-assimp = "fd7cd819e9e130385e17e707da31e60b82e787d0"
+SRCREV_qtquick3dphysics = "bd8d13959258747dbdf615ba429a14570e13786d"
+SRCREV_qtquickdesigner-components = "41eb62ef3f71a0c2c74de237cb0f5224a2cd94dc"
+SRCREV_qtquicktimeline = "0e621d5fba45cd44138887d5418272fd7b7c4aa8"
+SRCREV_qtremoteobjects = "d8bc0d7cc7a4ff131ec039f5b155973366ae15f0"
+SRCREV_qtscxml = "bf53edfa0b3c8cb39ee6b27ff9edadf870a09f5a"
+SRCREV_qtsensors = "7af391b9d397c7b1fb9ed7c68830df36aab34069"
+SRCREV_qtserialbus = "a171818260beee933e32f6b19db2fa8b4244977e"
+SRCREV_qtserialport = "ca366cc8d7f17a90cb303f6944b1ab9a7f1d62e2"
+SRCREV_qtshadertools = "c7c5a2b27b093a1c697cb41013f8f05678649b50"
+SRCREV_qtspeech = "7c0c3bff384d9a9c88c2c9b090f17ad9f61029de"
+SRCREV_qtsvg = "56a861c1a67beab7f9f09340550def485468264e"
+SRCREV_qttools = "b4920210050c18913531ac237f294e2632a2edda"
+SRCREV_qttools-qlitehtml = "f05f78ef33225823d348ee18f2fa464e95024dd2"
+SRCREV_qttools-qlitehtml-litehtml = "43af58e8adad70c4f1a0a9235546a246754c1737"
+SRCREV_qttranslations = "660d2ffc4be83838e45a03fb3d03384279fc7081"
+SRCREV_qtvirtualkeyboard = "a4c4f67468edaea98be16ed338ef07c9c96833ca"
+SRCREV_qtwayland = "78f6a3877fd20c68be1e00a8fe27f7a399ce95b8"
+SRCREV_qtwebchannel = "951929518a183f9dd254603140a33be1fc9f35f6"
+SRCREV_qtwebengine = "0efae85f199a61fd6919703cfbb74d680d9a9443"
+SRCREV_qtwebengine-chromium = "be3ba7a0ebb340b9498e82c3506cf46ec5ddbee6"
+SRCREV_qtwebsockets = "51cae79f950c11cca5609cda85a94e9553f44a31"
+SRCREV_qtwebview = "3fbafefaa821bef27a5e04b5e0a3e30c98eb16af"

recipes-qt/qt6/qt6-ptest.inc

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

recipes-qt/qt6/qt6.inc

@@ -1,5 +1,14 @@
+inherit srcrev-update
+
 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() {
@@ -23,9 +32,14 @@ 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"
+PACKAGE_BEFORE_PN = "${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-examples"
 
 ALLOW_EMPTY:${PN} = "1"
 ALLOW_EMPTY:${PN}-plugins = "1"
@@ -73,9 +87,8 @@ FILES:${PN}-dev += " \
     ${QT6_INSTALL_LIBDIR}/*.prl \
     ${QT6_INSTALL_LIBDIR}/*.la \
     ${QT6_INSTALL_LIBDIR}/cmake \
-    ${QT6_INSTALL_ARCHDATADIR}/metatypes \
+    ${QT6_INSTALL_LIBDIR}/metatypes \
     ${QT6_INSTALL_LIBDIR}/pkgconfig \
-    ${QT6_INSTALL_ARCHDATADIR}/sbom \
     ${QT6_INSTALL_MKSPECSDIR} \
     ${QT6_INSTALL_QMLDIR}/*.qmltypes \
     ${QT6_INSTALL_QMLDIR}/*/*.qmltypes \
@@ -108,3 +121,10 @@ 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

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

@@ -11,29 +11,24 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.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"
 
-EXTRA_OECMAKE += "-DQT_APPMAN_SKIP_EXCLUDE_TOOLS_FROM_DEFAULT_TARGET=ON"
-
-PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'multi-process bubblewrap', '', d)}"
+PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'multi-process', '', d)}"
 
 PACKAGECONFIG[tools-only] = "-DFEATURE_am_tools_only=ON, -DFEATURE_am_tools_only=OFF"
-PACKAGECONFIG[multi-process] = "-DFEATURE_am_multi_process=ON,-DFEATURE_am_multi_process=OFF,qtwayland"
-PACKAGECONFIG[bubblewrap] = "-DFEATURE_am_bubblewrap_container=ON,-DFEATURE_am_bubblewrap_container=OFF,,bubblewrap"
+PACKAGECONFIG[multi-process] = "-DFEATURE_am_multi_process=ON, -DFEATURE_am_multi_process=OFF, qtwayland qtwayland-native"
 
 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

@@ -1,14 +0,0 @@
-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 27896986b3c2930ccbbe062d3e7a0b7bcc08caf1 Mon Sep 17 00:00:00 2001
+From 4064b8757cbb28588fdff2529ea203bf3eabc579 Mon Sep 17 00:00:00 2001
 From: Holger Freyther <zecke@selfish.org>
 Date: Wed, 26 Sep 2012 17:22:30 +0200
 Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the
@@ -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 4b116c54b2e..bfa21c997b4 100644
+index 92729b06f1..dac7857600 100644
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -103,7 +103,12 @@ static std::unique_ptr<QSettings> findConfiguration()
+@@ -101,7 +101,12 @@ static QSettings *findConfiguration()
      if (qtconfManualPath)
-         return std::make_unique<QSettings>(*qtconfManualPath, QSettings::IniFormat);
+         return new 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 std::make_unique<QSettings>(qtconfig, QSettings::IniFormat);
++        return new QSettings(qtconfig, QSettings::IniFormat);
 +
 +    qtconfig = QStringLiteral(":/qt/etc/qt.conf");
-     if (QResource(qtconfig, QLocale::c()).isValid())
-         return std::make_unique<QSettings>(qtconfig, QSettings::IniFormat);
+     if (QFile::exists(qtconfig))
+         return new QSettings(qtconfig, QSettings::IniFormat);
  #ifdef Q_OS_DARWIN

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

@@ -1,67 +0,0 @@
-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 9a8f4cadd4a90e0e5a347bb38210869a5fd28e0f Mon Sep 17 00:00:00 2001
+From 07f7e1ae76b24ba64cd87726c438638a8fa3eba0 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,22 +7,23 @@ 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 15c040a2e3c..913e233a524 100644
+index 6cdb8f3376..3007585e1c 100644
 --- a/src/testlib/CMakeLists.txt
 +++ b/src/testlib/CMakeLists.txt
-@@ -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=\"\""
-     ">"
+@@ -121,8 +121,8 @@ set(qt_tc_build_dir_def
+     "$<IF:${qt_bool_tc_build_dir},${qt_tc_build_dir},$<TARGET_PROPERTY:BINARY_DIR>>"
  )
  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,5 +1,4 @@
-LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) \
-    & GFDL-1.3-no-invariants-only) & Apache-2.0 & BSD-3-Clause & BSL-1.0 & LGPL-2.1-or-later & HPND & MIT"
+LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only) & Apache-2.0 & BSD-3-Clause & BSL-1.0 & MIT"
 LIC_FILES_CHKSUM = " \
     file://LICENSES/Apache-2.0.txt;md5=b4c615f64dff32f71eeed614d13dfd4c \
     file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
@@ -7,28 +6,25 @@ 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 verify-qt-version
+inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
+include recipes-qt/qt6/conan.inc
 
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
-    file://0003-Add-OE-specific-specs-for-clang-compiler.patch \
+    file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
     file://0004-Fix-qt.toolchain.cmake-for-SDK-use.patch \
     file://0005-testlib-don-t-track-the-build-or-source-directories.patch \
 "
-SRC_URI:append:class-native = "\
-    file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
-"
 
 DEPENDS += "\
     patchelf-native \
@@ -38,17 +34,18 @@ DEPENDS += "\
 DEPENDS:remove:class-native = "qtbase-native"
 RDEPENDS_${PN}:remove:class-native = "libssl-native"
 
-RRECOMMENDS:${PN}:append:libc-glibc:class-target = " locale-base-c"
+RRECOMMENDS:${PN}:append:class-target = " locale-base-c"
 RRECOMMENDS:${PN}-ptest:append = " tzdata"
 
 PACKAGECONFIG:class-native ?= "\
     gui widgets jpeg png dbus no-opengl openssl zlib 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} \
@@ -56,21 +53,17 @@ 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', '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 \
+        bb.utils.contains('DISTRO_FEATURES', 'x11', 'gl', 'kms gbm gles2 eglfs', d), 'no-opengl linuxfb', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
 "
+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 \
@@ -80,7 +73,6 @@ 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 \
@@ -89,7 +81,6 @@ 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"
@@ -100,20 +91,18 @@ BUILD_TYPE ?= "Release"
 OPENSSL_LINKING_MODE ?= "runtime"
 
 # Default platform plugin
-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)}\
-"
+QT_QPA_DEFAULT_PLATFORM ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', \
+    bb.utils.contains('PACKAGECONFIG', 'gles2', 'eglfs', 'linuxfb', d), d)}"
+
+# at-spi bridge requires XCB currently
+ACCESSIBILITY_DEPENDS = "${@bb.utils.contains("DISTRO_FEATURES", "x11", "at-spi2-core", "", d)}"
 
 PACKAGECONFIG[ltcg] = "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON,-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF"
 PACKAGECONFIG[optimize-size] = "-DFEATURE_optimize_size=ON,-DFEATURE_optimize_size=OFF"
 PACKAGECONFIG[static] = "-DBUILD_SHARED_LIBS=OFF,-DBUILD_SHARED_LIBS=ON"
-PACKAGECONFIG[developer-build] = "-DFEATURE_developer_build=ON -DQT_BUILD_TESTS=OFF -DWARNINGS_ARE_ERRORS=OFF,-DFEATURE_developer_build=OFF"
+PACKAGECONFIG[developer-build] = "-DFEATURE_developer_build=ON,-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"
@@ -126,22 +115,20 @@ 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"
-PACKAGECONFIG[accessibility-atspi-bridge] = "-DFEATURE_accessibility_atspi_bridge=ON,-DFEATURE_accessibility_atspi_bridge=OFF,at-spi2-core"
+PACKAGECONFIG[accessibility] = "-DFEATURE_accessibility=ON,-DFEATURE_accessibility=OFF,${ACCESSIBILITY_DEPENDS}"
 PACKAGECONFIG[directfb] = "-DFEATURE_directfb=ON,-DFEATURE_directfb=OFF,directfb"
 PACKAGECONFIG[fontconfig] = "-DFEATURE_fontconfig=ON,-DFEATURE_fontconfig=OFF,fontconfig"
 PACKAGECONFIG[gbm] = "-DFEATURE_gbm=ON,-DFEATURE_gbm=OFF,virtual/libgbm"
 PACKAGECONFIG[gl] = "-DFEATURE_opengl_desktop=ON,-DFEATURE_opengl_desktop=OFF,virtual/libgl"
 PACKAGECONFIG[gles2] = "-DFEATURE_opengles2=ON,-DFEATURE_opengles2=OFF,virtual/libgles2 virtual/egl"
-PACKAGECONFIG[eglfs] = "-DFEATURE_eglfs=ON,-DFEATURE_eglfs=OFF,virtual/egl"
+PACKAGECONFIG[eglfs] = "-DFEATURE_eglfs=ON,-DFEATURE_eglfs=OFF"
 PACKAGECONFIG[eglfs-egldevice] = "-DFEATURE_eglfs_egldevice=ON,-DFEATURE_eglfs_egldevice=OFF"
 PACKAGECONFIG[harfbuzz] = "-DFEATURE_harfbuzz=ON,-DFEATURE_harfbuzz=OFF,harfbuzz"
 PACKAGECONFIG[jpeg] = "-DFEATURE_jpeg=ON,-DFEATURE_jpeg=OFF,jpeg"
-PACKAGECONFIG[kms] = "-DFEATURE_kms=ON,-DFEATURE_kms=OFF,drm"
+PACKAGECONFIG[kms] = "-DFEATURE_kms=ON,-DFEATURE_kms=OFF,drm virtual/egl"
 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"
@@ -149,8 +136,6 @@ 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"
 
@@ -181,13 +166,10 @@ 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}"
@@ -206,11 +188,6 @@ 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
@@ -218,16 +195,13 @@ 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}/* \
-        -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}/* \
+        -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|"
 
@@ -258,11 +232,6 @@ 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

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

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

@@ -1,18 +0,0 @@
-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,13 +1,15 @@
-LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only"
+LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & 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
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"

recipes-qt/qt6/qtcoap-examples_git.bb

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

@@ -10,6 +10,10 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.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

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

@@ -12,9 +12,10 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
-DEPENDS += "qtbase"
+DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
 
 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

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

@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake features_check
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 REQUIRED_DISTRO_FEATURES = "opengl"

recipes-qt/qt6/qtdeclarative-examples_git.bb

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

@@ -13,10 +13,10 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
-DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native qtlanguageserver qtsvg"
+DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native qtlanguageserver"
 
 BBCLASSEXTEND = "native nativesdk"
 
-INSANE_SKIP:${PN}-ptest += "buildpaths"

recipes-qt/qt6/qtdeviceutilities-examples_git.bb

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

recipes-qt/qt6/qtdoc-examples_git.bb

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

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

@@ -1,18 +0,0 @@
-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/qtgraphs_git.bb

@@ -1,15 +0,0 @@
-LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & 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
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6.inc
-
-DEPENDS += "qtbase qtdeclarative qtdeclarative-native qtquick3d qtquick3d-native"

recipes-qt/qt6/qtgrpc-examples_git.bb

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

@@ -11,13 +11,11 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtgrpc-native protobuf protobuf-native"
 
-PACKAGECONFIG ?= "qml"
-PACKAGECONFIG[qml] = "-DFEATURE_grpcquick=ON,-DFEATURE_grpcquick=OFF,qtdeclarative qtdeclarative-native"
+PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtdeclarative-native"
 
 BBCLASSEXTEND = "native nativesdk"
-
-INSANE_SKIP:${PN}-ptest += "buildpaths"

recipes-qt/qt6/qthttpserver-examples_git.bb

@@ -1,14 +0,0 @@
-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,14 +1,16 @@
-LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only & BSD-3-Clause"
+LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & 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
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"

recipes-qt/qt6/qtimageformats_git.bb

@@ -1,20 +1,22 @@
-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"
+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"
 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
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-PACKAGECONFIG ?= "jasper mng tiff webp"
+PACKAGECONFIG ?= "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

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

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

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

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

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

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

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

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

@@ -11,20 +11,61 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.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"
 
-PACKAGECONFIG ?= "ifcodegen remoteobjects"
-PACKAGECONFIG:append:class-native = " host-tools-only"
-PACKAGECONFIG:append:class-nativesdk = " host-tools-only"
+PRIVATE_LIBS:${PN}-examples = "libInstrumentCluster.so"
 
+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,19 +1,19 @@
-LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & (LGPL-3.0-only | GPL-2.0-only) & GFDL-1.3-no-invariants-only"
+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"
 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
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
 BBCLASSEXTEND = "native nativesdk"
-
-INSANE_SKIP:${PN}-ptest += "buildpaths"

recipes-qt/qt6/qtlocation-examples_git.bb

@@ -1,17 +0,0 @@
-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,17 +1,16 @@
-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"
+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/MIT.txt;md5=3605d54ecceddcd50962eb89318779ec \
+    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 \
 "
 
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtpositioning"
@@ -22,5 +21,3 @@ 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,20 +1,16 @@
-LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only"
+LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & 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
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
-DEPENDS += "\
-    qtbase \
-    qtdeclarative \
-    qtdeclarative-native \
-    qtlottie-native \
-"
+DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
 
-BBCLASSEXTEND = "native nativesdk"

recipes-qt/qt6/qtmqtt-examples_git.bb

@@ -1,18 +0,0 @@
-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,14 +1,19 @@
-LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only & BSD-3-Clause"
+LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & 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
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.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

@@ -1,18 +0,0 @@
-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 \
-"

recipes-qt/qt6/qtmultimedia_git.bb

@@ -16,6 +16,7 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtshadertools qtshadertools-native"
@@ -25,6 +26,7 @@ PACKAGECONFIG ?= "\
     gstreamer pulseaudio qml spatialaudio spatialaudio_quick3d"
 
 PACKAGECONFIG[alsa] = "-DFEATURE_alsa=ON,-DFEATURE_alsa=OFF,alsa-lib"
+PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtsvg"
 PACKAGECONFIG[ffmpeg] = "-DFEATURE_ffmpeg=ON,-DFEATURE_ffmpeg=OFF,ffmpeg"
 PACKAGECONFIG[gstreamer] = "-DFEATURE_gstreamer=ON,-DFEATURE_gstreamer=OFF,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
 PACKAGECONFIG[pulseaudio] = "-DFEATURE_pulseaudio=ON,-DFEATURE_pulseaudio=OFF,pulseaudio"

recipes-qt/qt6/qtnetworkauth-examples_git.bb

@@ -1,14 +0,0 @@
-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 = "qtnetworkauth"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "qtnetworkauth"

recipes-qt/qt6/qtnetworkauth_git.bb

@@ -1,14 +1,16 @@
-LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only & BSD-3-Clause"
+LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & 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
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"

recipes-qt/qt6/qtopcua-examples_git.bb

@@ -1,18 +0,0 @@
-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 = "qtopcua"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "\
-    qtdeclarative-native \
-    qtopcua \
-    qtopcua-native \
-"

recipes-qt/qt6/qtopcua_git.bb

@@ -1,16 +1,12 @@
-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 & CC-BY-SA-4.0 & CC0-1.0 & MIT & MPL-2.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) & GFDL-1.3-no-invariants-only) & BSD-3-Clause & CC-BY-SA-4.0 & CC0-1.0 & MIT & MPL-2.0"
 LIC_FILES_CHKSUM = " \
-    file://LICENSES/Apache-2.0.txt;md5=b4c615f64dff32f71eeed614d13dfd4c \
     file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
-    file://LICENSES/CC0-1.0.txt;md5=65d3616852dbf7b1a6d4b53b00626032 \
-    file://LICENSES/CC-BY-SA-4.0.txt;md5=bb082061306cc1dc0afcd128f972d344 \
     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 \
-    file://LICENSES/MPL-2.0.txt;md5=48a3fe23ed1353e0995dadfda05ffdb6 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
     file://src/3rdparty/open62541/BSD-3-CLAUSE;md5=8647c60c0b1892cb8f30c8efd60b318f \
     file://src/3rdparty/open62541/CC-BY-SA-4.0;md5=bb082061306cc1dc0afcd128f972d344 \
     file://src/3rdparty/open62541/LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -22,19 +18,16 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
-PACKAGECONFIG ?= "qml open62541"
-PACKAGECONFIG:class-native ?= ""
-PACKAGECONFIG:class-nativesdk ?= ""
+PACKAGECONFIG ?= "qml"
 PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
-PACKAGECONFIG[open62541] = "-DFEATURE_open62541=ON,-DFEATURE_open62541=OFF,openssl"
 
 # src/3rdparty/open62541.pri adds -Wno-format, causing following error
 # because -Wformat-security cannot be used together with -Wno-format
 # cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]
 SECURITY_STRINGFORMAT = ""
 
-DEPENDS += "qtbase qtopcua-native"
+DEPENDS += "qtbase"
 
-BBCLASSEXTEND = "native nativesdk"

recipes-qt/qt6/qtpdf-examples_git.bb

@@ -1,29 +0,0 @@
-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"
-
-COMPATIBLE_MACHINE = "(-)"
-COMPATIBLE_MACHINE:libc-musl = "(-)"
-COMPATIBLE_MACHINE:aarch64 = "(.*)"
-COMPATIBLE_MACHINE:armv6 = "(.*)"
-COMPATIBLE_MACHINE:armv7a = "(.*)"
-COMPATIBLE_MACHINE:armv7ve = "(.*)"
-COMPATIBLE_MACHINE:x86-64 = "(.*)"
-
-QT_MODULE = "qtwebengine"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "\
-    qtdeclarative-native \
-    qtpdf \
-"
-