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

Change-Id: I82bee603fb6e1552c2a032b1673a4f42f99f44d9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
squish: upgrade to 9.1.0
2026-01-01 13:58:07 +00:00 · 2025-10-09 12:34:08 +00:00 · 2025-10-07 06:51:53 +00:00 · 2025-10-07 06:51:43 +00:00 · 2025-09-29 03:41:17 +00:00 · 2025-09-26 05:47:08 +00:00
134 changed files with 1130 additions and 1422 deletions
--- a/README.md
+++ b/README.md
@ -7,6 +7,10 @@ URI: https://git.openembedded.org/openembedded-core/

 URI: https://git.openembedded.org/meta-openembedded/

+and optionally:
+
+URI https://github.com/kraj/meta-clang
+
 Yocto version support
 ---------------------

@ -20,23 +24,22 @@ Following table shows the Yocto releases which are used to test each
 Qt version (x) and any additional Yocto releases that are stated in
 the LAYERSERIES_COMPAT (c).

-| Yocto \ Qt | dev | 6.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 |
+| Yocto \ Qt | 6.8 | 6.7 | 6.6 | 6.5 | 6.4 | 6.3 | 6.2 |
+|:---------- |:---:|:---:|:---:|:---:|:---:|:---:|:---:|
+| whinlatter |  x  |     |     |     |     |     |     |
+| walnascar  |  x  |     |     |     |     |     |     |
+| styhead    |  x  |  c  |     |     |     |     |     |
+| scarthgap  |  x  |  c  |  c  |  x  |     |     |     |
+| nanbield   |  c  |  c  |  c  |  c  |     |     |     |
+| mickledore |  c  |  c  |  c  |  c  |  c  |     |     |
+| langdale   |  c  |  c  |  c  |  c  |  c  |     |     |
+| kirkstone  |  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  |
+|            |     |     |     |     |     |     |     |
+|            | 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
--- a/classes/qt6-qmake.bbclass
+++ b/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}
+QmlImports = ${OE_QMAKE_PATH_QML}
+Translations = ${OE_QMAKE_PATH_TRANSLATIONS}
+Documentation = ${OE_QMAKE_PATH_DOCS}
+Settings = ${OE_QMAKE_PATH_SETTINGS}
+Examples = ${OE_QMAKE_PATH_EXAMPLES}
+Tests = ${OE_QMAKE_PATH_TESTS}
+HostBinaries = ${OE_QMAKE_PATH_BINS}
+HostData = ${OE_QMAKE_PATH_ARCHDATA}
+HostLibraries = ${OE_QMAKE_PATH_LIBS}
+HostSpec = ${OE_QMAKE_PLATFORM}
+TargetSpec = ${OE_QMAKE_PLATFORM}
+ExternalHostBinaries = ${OE_QMAKE_PATH_BINS}
+Sysroot =
+EOF
+}
+
 do_generate_qt_config_file() {
+    generate_qt_config_file_paths
+    generate_qt_config_file_effective_paths
+}
+
+generate_qt_config_file_paths() {
    cat > ${OE_QMAKE_QTCONF_PATH} <<EOF
 [Paths]
 Prefix = ${OE_QMAKE_PATH_PREFIX}
@ -96,18 +130,28 @@ 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.
@ -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

--- a/classes/verify-qt-version.bbclass
+++ b/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
-
--- a/coin/module_config.yaml
+++ b/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-64  qemuarm         qemux86         qemuarm64
+# [yocto]   master          walnascar   scarthgap       styhead         kirkstone
+# [wayland] yes             no          no              yes             yes
+# [mingw]   no              no          yes             no              no
+# [static]  no              no          no              no              yes
+#

 target1: &target1
  type: Group
@ -36,10 +34,7 @@ target1: &target1
      variableValue: master.xml
    - type: EnvironmentVariable
      variableName: TEST_CONFIGS
-      variableValue: ci configs wayland opengl
-    - type: EnvironmentVariable
-      variableName: CHECK_COMPATIBILITY
-      variableValue: 1
+      variableValue: ci configs wayland python
  enable_if:
      condition: property
      property: target.arch
@ -55,7 +50,7 @@ target2: &target2
      variableValue: walnascar.xml
    - type: EnvironmentVariable
      variableName: TEST_CONFIGS
-      variableValue: ci configs x11 opengl
+      variableValue: ci configs python
  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 mingw python
  enable_if:
      condition: property
      property: target.arch
@ -84,10 +79,10 @@ target4: &target4
      variableValue: qemux86
    - type: EnvironmentVariable
      variableName: MANIFEST
-      variableValue: whinlatter.xml
+      variableValue: styhead.xml
    - type: EnvironmentVariable
      variableName: TEST_CONFIGS
-      variableValue: ci configs wayland opengl
+      variableValue: ci configs wayland no-webengine python
  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 python
  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"
@ -183,24 +144,14 @@ instructions:
          --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
      bitbake-layers add-layer ../meta-mingw
+      if [ -e ../meta-clang ]; then
+        bitbake-layers add-layer ../meta-clang
+      fi
      bitbake-layers add-layer ${SOURCE_DIR}

      for conf in ${TEST_CONFIGS}; do
@ -208,10 +159,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
--- a/coin/test-clang.inc
+++ b/coin/test-clang.inc
@ -1,4 +0,0 @@
-PREFERRED_TOOLCHAIN_TARGET = "clang"
-DISTRO_FEATURES:append = " ld-is-lld"
-
-INSANE_SKIP:grpc-dbg = "buildpaths"
--- a/coin/test-configs.inc
+++ b/coin/test-configs.inc
@ -1,4 +1,3 @@
-DISTRO = "poky"
 # use systemd
 INIT_MANAGER:forcevariable = "systemd"

@ -40,17 +39,69 @@ INSANE_SKIP:append:pn-nativesdk-clang = " buildpaths"
 PREFERRED_ARM_INSTRUCTION_SET              ?= "thumb"
 ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}"

+# build squish
+USE_SQUISH = "1"
+SQUISH_MIRROR = "https://ci-files01-hki.ci.qt.io/input/squish/releasepackages"
+SQUISH_LICENSE_KEY = "qt-srv-19.intra.qt.io:49345"
+
 # enable webengine with commercial/proprietary features
+DISTRO_FEATURES:append = " webengine"
 PACKAGECONFIG:append:pn-qtwebengine = " proprietary-codecs"

 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)} \
 "

-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-qtgraphs = " examples"
+PACKAGECONFIG:append:pn-qtgrpc = " examples"
+PACKAGECONFIG:append:pn-qthttpserver = " examples"
+PACKAGECONFIG:append:pn-qtimageformats = " examples"
+PACKAGECONFIG:append:pn-qtinsighttracker = " examples"
+PACKAGECONFIG:append:pn-qtinterfaceframework = " examples"
+PACKAGECONFIG:append:pn-qtlanguageserver = " examples"
+PACKAGECONFIG:append:pn-qtlocation = " examples"
+PACKAGECONFIG:append:pn-qtlottie = " examples"
+PACKAGECONFIG:append:pn-qtmqtt = " examples"
+PACKAGECONFIG:append:pn-qtmultimedia = " examples"
+PACKAGECONFIG:append:pn-qtnetworkauth = " examples"
+PACKAGECONFIG:append:pn-qtopcua = " examples"
+PACKAGECONFIG:append:pn-qtpdf = " examples"
+PACKAGECONFIG:append:pn-qtpositioning = " examples"
+PACKAGECONFIG:append:pn-qtquick3d = " examples"
+PACKAGECONFIG:append:pn-qtquick3dphysics = " examples"
+PACKAGECONFIG:append:pn-qtquickdesigner-components = " examples"
+PACKAGECONFIG:append:pn-qtquicktimeline = " examples"
+PACKAGECONFIG:append:pn-qtremoteobjects = " examples"
+PACKAGECONFIG:append:pn-qtscxml = " examples"
+PACKAGECONFIG:append:pn-qtsensors = " examples"
+PACKAGECONFIG:append:pn-qtserialbus = " examples"
+PACKAGECONFIG:append:pn-qtserialport = " examples"
+PACKAGECONFIG:append:pn-qtshadertools = " examples"
+PACKAGECONFIG:append:pn-qtspeech = " examples"
+PACKAGECONFIG:append:pn-qtsvg = " examples"
+PACKAGECONFIG:append:pn-qttools = " examples"
+PACKAGECONFIG:append:pn-qttranslations = " examples"
+PACKAGECONFIG:append:pn-qtvirtualkeyboard = " examples"
+PACKAGECONFIG:append:pn-qtvncserver = " examples"
+PACKAGECONFIG:append:pn-qtwayland = " examples"
+PACKAGECONFIG:append:pn-qtwebchannel = " examples"
+PACKAGECONFIG:append:pn-qtwebengine = " examples"
+PACKAGECONFIG:append:pn-qtwebsockets = " examples"
+PACKAGECONFIG:append:pn-qtwebview = " examples"
--- a/coin/test-no-webengine.inc
+++ b/coin/test-no-webengine.inc
@ -0,0 +1 @@
+DISTRO_FEATURES:remove = "webengine"
--- a/coin/test-opengl.inc
+++ b/coin/test-opengl.inc
@ -1,2 +0,0 @@
-DISTRO_FEATURES:append = " opengl vulkan"
-DISTRO_FEATURES:append = " webengine"
--- a/coin/test-python.inc
+++ b/coin/test-python.inc
@ -0,0 +1,2 @@
+RDEPENDS:${PN}:append:pn-packagegroup-qt6-addons = " python3-pyside6"
+
--- a/coin/test-static.inc
+++ b/coin/test-static.inc
@ -1,5 +1,3 @@
 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"
+PACKAGECONFIG:remove:pn-qtapplicationmanager = "multi-process"
--- a/coin/test-wayland.inc
+++ b/coin/test-wayland.inc
@ -1 +1,2 @@
+DISTRO_FEATURES:remove = "x11"
 DISTRO_FEATURES:append = " wayland"
--- a/coin/test-x11.inc
+++ b/coin/test-x11.inc
@ -1 +0,0 @@
-DISTRO_FEATURES:append = " x11"
--- a/conf/layer.conf
+++ b/conf/layer.conf
@ -35,7 +35,7 @@ LAYERVERSION_qt6-layer = "1"

 LAYERDEPENDS_qt6-layer = "core openembedded-layer meta-python"

-LAYERSERIES_COMPAT_qt6-layer = "scarthgap styhead walnascar whinlatter"
+LAYERSERIES_COMPAT_qt6-layer = "kirkstone langdale mickledore nanbield scarthgap styhead walnascar whinlatter"

 LICENSE_PATH += "${LAYERDIR}/licenses"

@ -46,9 +46,15 @@ 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.8.5"

 QT_COMMERCIAL_GIT ?= "git://codereview.qt-project.org"
 QT_COMMERCIAL_GIT_PROTOCOL ?= "ssh"

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

 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-click \
    python3-pyyaml \
-    python3-six \
-    python3-watchdog \
    python3-pytest \
-    python3-colorama \
+    python3-six \
+    python3-path \
+    python3-antlr4-runtime \
+    python3-watchdog \
+    python3-markupsafe \
+    python3-setuptools \
 "
 DEPENDS += "${DEPS}"
 RDEPENDS:${PN} += "${DEPS}"
--- a/recipes-multimedia/webp/libwebp_%.bbappend
+++ b/recipes-multimedia/webp/libwebp_%.bbappend
@ -0,0 +1 @@
+BBCLASSEXTEND = "native nativesdk"
--- a/recipes-python/pyqt6/python3-pyqt-builder-native_1.18.0.bb
+++ b/recipes-python/pyqt6/python3-pyqt-builder-native_1.18.0.bb
@ -0,0 +1,12 @@
+SUMMARY = "The PEP 517 compliant PyQt build system"
+HOMEPAGE = "https://pypi.org/project/PyQt-builder/"
+LICENSE = "GPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ed1d69a33480ebf4ff8a7a760826d84e"
+
+SRC_URI[sha256sum] = "ce9930aafc1ce0af928a6944bcc80ecf78c23ffdcad6ac111306c4c71057848e"
+
+inherit pypi python_setuptools_build_meta native
+
+PYPI_PACKAGE = "pyqt_builder"
+
+DEPENDS += "python3-setuptools-scm-native"
--- a/recipes-python/pyqt6/python3-pyqt6-sip_13.10.0.bb
+++ b/recipes-python/pyqt6/python3-pyqt6-sip_13.10.0.bb
@ -0,0 +1,12 @@
+SUMMARY = "The sip module support for PyQt6"
+HOMEPAGE = "https://github.com/Python-SIP/sip"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=bc996f4e03c98eae60de43496026f863"
+
+SRC_URI[sha256sum] = "d6daa95a0bd315d9ec523b549e0ce97455f61ded65d5eafecd83ed2aa4ae5350"
+
+inherit pypi setuptools3
+
+PYPI_PACKAGE = "pyqt6_sip"
+
+BBCLASSEXTEND = "native nativesdk"
--- a/recipes-python/pyqt6/python3-pyqt6/0001-Fix-build-with-Qt-6.8.2.patch
+++ b/recipes-python/pyqt6/python3-pyqt6/0001-Fix-build-with-Qt-6.8.2.patch
@ -0,0 +1,32 @@
+From ee6c2c30eca67004e2b05f55ee1d82c3ab44b966 Mon Sep 17 00:00:00 2001
+From: Christophe Marin <christophe@krop.fr>
+Date: Sun, 2 Feb 2025 12:59:19 +0100
+Subject: [PATCH] Fix build with Qt 6.8.2
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+/home/abuild/rpmbuild/BUILD/python-PyQt6-6.8.0-build/PyQt6-6.8.0/build/QtCore/sipQtCoreQStringConverterBase.cpp:58:52: error: use of deleted function ‘constexpr QStringConverterBase::QStringConverterBase(const QStringConverterBase&)’
+
+Upstream-Status: Pending
+
+---
+ sip/QtCore/qstringconverter_base.sip | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sip/QtCore/qstringconverter_base.sip b/sip/QtCore/qstringconverter_base.sip
+index d0c790f..6f7c301 100644
+--- a/sip/QtCore/qstringconverter_base.sip
+++ b/sip/QtCore/qstringconverter_base.sip
+@@ -22,7 +22,7 @@
+ 
+ %If (Qt_6_4_0 -)
+ 
+-class QStringConverterBase
+class QStringConverterBase /NoDefaultCtors/
+ {
+ %TypeHeaderCode
+ #include <qstringconverter_base.h>
+-- 
+2.48.1
--- a/recipes-python/pyqt6/python3-pyqt6_6.8.0.bb
+++ b/recipes-python/pyqt6/python3-pyqt6_6.8.0.bb
@ -0,0 +1,110 @@
+SUMMARY = "Python Qt6 Bindings"
+HOMEPAGE = "https://www.riverbankcomputing.com/software/pyqt"
+SECTION = "devel/python"
+LICENSE = "GPL-3.0-only"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
+
+inherit pypi python3targetconfig python3-dir qt6-qmake qt6-paths
+
+PYPI_PACKAGE = "PyQt6"
+
+SRC_URI[sha256sum] = "6d8628de4c2a050f0b74462e4c9cb97f839bf6ffabbca91711722ffb281570d9"
+SRC_URI += "file://0001-Fix-build-with-Qt-6.8.2.patch"
+
+S = "${WORKDIR}/PyQt6-${PV}"
+B = "${S}/build"
+
+DEPENDS += " \
+    qtbase \
+    qtdeclarative \
+    sip (>= 6.7.12) \
+    sip-native (>= 6.7.12) \
+    python3 \
+    python3-pyqt6-sip-native \
+    python3-pyqt6-sip \
+    python3-packaging-native \
+    python3-tomli-native \
+    python3-pyqt-builder-native \
+    python3-ply \
+    python3-ply-native \
+"
+
+RDEPENDS:${PN} += " \
+    qtbase \
+    qtdeclarative \
+    python3-core \
+    python3-pyqt6-sip \
+"
+
+# Disable support of 128bit ints and add path to Python.h
+CXXFLAGS += " -DQT_NO_INT128 -I${PYTHON_INCLUDE_DIR}"
+
+EXTRA_OEMAKE += "INSTALL_ROOT=${D}"
+
+DISABLED_FEATURES = " \
+    PyQt_Desktop_OpenGL \
+    PyQt_Accessibility \
+    PyQt_SessionManager \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '', 'PyQt_OpenGL', d)} \
+"
+
+PYQT_MODULES = " \
+    QtCore \
+    QtGui \
+    QtNetwork \
+    QtXml \
+    QtNetwork \
+    QtQml \
+    QtSql \
+"
+
+do_configure() {
+    extra_args=""
+
+    for i in ${DISABLED_FEATURES}; do
+        extra_args="$extra_args --disabled-feature=$i"
+    done
+
+    for i in ${PYQT_MODULES}; do
+        extra_args="$extra_args --enable=$i"
+    done
+
+    cd ${S}
+    sip-build \
+        --verbose \
+        --confirm-license \
+        --scripts-dir="${bindir}" \
+        --build-dir="${B}" \
+        --target-dir="${PYTHON_SITEPACKAGES_DIR}" \
+        --no-make \
+        --qmake=${OE_QMAKE_QMAKE} \
+        --pep484-pyi \
+        --no-dbus-python \
+        $extra_args
+
+    QMAKE_PROFILES=${B}/PyQt6.pro
+
+    # Fixes: cc1plus: error: include location "/usr/include/python3.13"
+    # is unsafe for cross-compilation [-Werror=poison-system-directories]
+    sed -i "s|/usr/include/${PYTHON_DIR}|${PYTHON_INCLUDE_DIR}|g" ${B}/*/*.pro
+}
+
+do_compile:append() {
+    sed -i "s,${STAGING_DIR_TARGET},," ${B}/inventory.txt
+}
+
+do_install:append() {
+    sed -i "s,exec .*nativepython3,exec ${bindir}/python3," ${D}/${bindir}/*
+}
+
+# fix buildpaths warnings in python3-pyqt6-src
+pyqt_fix_sources() {
+    find ${PKGD}/usr/src/debug/${PN} -type f -exec sed -i "s,\(${B}\|${S}\),/usr/src/debug/${PN}/${PV}-${PR},g" {} \;
+}
+PACKAGESPLITFUNCS:prepend = "pyqt_fix_sources"
+
+# Ignore warnings about TMPDIR [buildpaths] in libpyqt6qmlplugin.so
+INSANE_SKIP:${PN} += "buildpaths"
+INSANE_SKIP:${PN}-dbg += "buildpaths"
+
+FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR} ${OE_QMAKE_PATH_PLUGINS}"
--- a/recipes-python/pyside6/python3-pyside6.inc
+++ b/recipes-python/pyside6/python3-pyside6.inc
@ -0,0 +1,35 @@
+LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only)"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
+"
+
+python() {
+    if not bb.utils.to_boolean(d.getVar('CAN_USE_PYSIDE6')):
+        raise bb.parse.SkipRecipe('clang is not available.')
+}
+
+inherit setuptools3
+inherit qt6-cmake
+
+require recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
+
+QT_GIT_PROJECT = "pyside"
+QT_MODULE = "tqtc-pyside-setup"
+QT_MODULE_REPO = "tqtc-pyside-setup"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/pyside6:"
+
+EXTRA_OECMAKE += "\
+    -DBUILD_TESTS=FALSE \
+    -DQFP_PYTHON_SITE_PACKAGES=${PYTHON_SITEPACKAGES_DIR} \
+"
+EXTRA_OECMAKE:append:class-target = " -DQFP_SHIBOKEN_HOST_PATH=${STAGING_EXECPREFIXDIR} -DQFP_PYTHON_HOST_PATH=${PYTHON}"
+
+INSANE_SKIP:${PN} += "already-stripped"
--- a/recipes-python/pyside6/python3-pyside6_git.bb
+++ b/recipes-python/pyside6/python3-pyside6_git.bb
@ -0,0 +1,71 @@
+require python3-pyside6.inc
+
+DEPENDS += "\
+    python3-shiboken6 \
+    python3-shiboken6-native \
+    ${PYSIDE_QT_MODULES} \
+"
+PYSIDE_QT_MODULES ?= "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d', '', d)} \
+    qtbase \
+    qtcharts \
+    qtconnectivity \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdatavis3d', '', d)} \
+    qtdeclarative \
+    qtdeclarative-native \
+    qtgraphs \
+    ${@bb.utils.contains('QT_COMMERCIAL_MODULES', '1', 'qthttpserver', '', d)} \
+    qtlocation \
+    qtmultimedia \
+    qtnetworkauth \
+    qtpositioning \
+    qtquick3d \
+    qtquick3d-native \
+    qtremoteobjects \
+    qtremoteobjects-native \
+    qtscxml \
+    qtscxml-native \
+    qtsensors \
+    qtserialbus \
+    qtserialport \
+    qtspeech \
+    qtsvg \
+    qttools \
+    qtwebchannel \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtpdf', '', d)} \
+    qtwebsockets \
+"
+
+OECMAKE_SOURCEPATH = "${S}/sources/pyside6"
+
+export LLVM_INSTALL_DIR = "${STAGING_DIR_NATIVE}${exec_prefix}"
+
+PYSIDE_COMPILER = "${HOST_SYS}-g++"
+PYSIDE_COMPILER:toolchain-clang = "${HOST_SYS}-clang++"
+# Workaround big.LITTLE architecture args not supported by clang
+PYSIDE_COMPILER_FLAGS = "${@d.getVar('HOST_CC_ARCH') \
+    .replace('cortex-a15.cortex','cortex') \
+    .replace('cortex-a17.cortex','cortex') \
+    .replace('cortex-a57.cortex','cortex') \
+    .replace('cortex-a72.cortex','cortex') \
+    .replace('cortex-a73.cortex','cortex') \
+    .replace('cortex-a75.cortex','cortex') \
+    .replace('cortex-a76.cortex','cortex')} \
+"
+
+EXTRA_OECMAKE += "\
+    -DSTANDALONE=ON \
+    -DPYSIDE_TREAT_QT_INCLUDE_DIRS_AS_NON_SYSTEM=ON \
+    -DSHIBOKEN_GENERATOR_EXTRA_FLAGS='\
+        --clang-options=--sysroot=${STAGING_DIR_TARGET},--target=${HOST_SYS},${@d.getVar('PYSIDE_COMPILER_FLAGS').replace(' ',',')} \
+        --compiler-path=${PYSIDE_COMPILER} \
+    ' \
+"
+
+FILES:${PN} += "\
+    ${QT6_INSTALL_PLUGINSDIR}/designer \
+"
+FILES:${PN}-dev += "\
+    ${datadir}/PySide6 \
+"
--- a/recipes-python/pyside6/python3-shiboken6_git.bb
+++ b/recipes-python/pyside6/python3-shiboken6_git.bb
@ -0,0 +1,16 @@
+require python3-pyside6.inc
+
+DEPENDS += "qtbase clang-native python3-shiboken6-native"
+
+OECMAKE_SOURCEPATH = "${S}/sources/shiboken6"
+
+EXTRA_OECMAKE += "-DSHIBOKEN_BUILD_LIBS=ON"
+
+do_install:append() {
+    # shiboken6.pc in package python3-shiboken6-dev contains reference to TMPDIR [buildpaths]
+    sed -i ${D}${QT6_INSTALL_LIBDIR}/pkgconfig/shiboken6.pc \
+        -e '/^python_/d' \
+        -e 's|${RECIPE_SYSROOT}||'
+}
+
+BBCLASSEXTEND = "native nativesdk"
--- a/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-addons.bb
+++ b/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-addons.bb
@ -11,12 +11,8 @@ 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 \
@ -27,6 +23,7 @@ RDEPENDS:${PN} += " \
    nativesdk-qtscxml-tools \
    nativesdk-qtshadertools-dev \
    nativesdk-qtshadertools-tools \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-qtwayland-dev nativesdk-qtwayland-tools', '', d)} \
    ${FORLINUXHOST} \
 "

--- a/recipes-qt/packagegroups/packagegroup-qt6-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt6-addons.bb
@ -8,10 +8,10 @@ inherit packagegroup
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"

 RDEPENDS:${PN} += " \
+    ${@'python3-pyside6' if bb.utils.to_boolean(d.getVar('CAN_USE_PYSIDE6')) else ''} \
    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d', '', d)} \
    qt5compat \
    qtapplicationmanager \
-    qtcanvaspainter \
    qtcharts \
    qtcoap \
    qtconnectivity \
@ -42,7 +42,6 @@ RDEPENDS:${PN} += " \
    qtshadertools \
    qtspeech \
    qtsvg \
-    qttasktree \
    qttranslations \
    qtvirtualkeyboard \
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
@ -74,5 +73,3 @@ RDEPENDS:${PN}:append:x86-64 = "\
    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
 "
-
-RDEPENDS:${PN}:remove:libc-musl = "qtpdf qtwebengine qtwebview"
--- a/recipes-qt/packagegroups/packagegroup-qt6-commercial-modules.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt6-commercial-modules.bb
@ -12,4 +12,5 @@ RDEPENDS:${PN} += " \
    qmlcompilerplus \
    qtinsighttracker \
    qtvncserver \
+    ${@'squish' if bb.utils.to_boolean(d.getVar('USE_SQUISH')) else ''} \
 "
--- a/recipes-qt/packagegroups/packagegroup-qt6-examples.bb
+++ b/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)} \
-"
-
--- a/recipes-qt/qt6/chromium-gn.inc
+++ b/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 = "(.*)"
--- a/recipes-qt/qt6/gn-utils.inc
+++ b/recipes-qt/qt6/gn-utils.inc
@ -50,20 +50,6 @@ 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,7 +72,7 @@ def write_toolchain_file(d, file_path):
        '  toolchain_args = {\n'
        '    current_cpu = "${current_cpu}"\n'
        '    current_os = "linux"\n'
-        '    is_clang = ${is_clang}\n'
+        '    is_clang = false\n'
        '    host_pkg_config = "${host_pkg_config}"\n'
        '  }\n'
        '}\n'
@ -94,7 +80,6 @@ def write_toolchain_file(d, file_path):

    native_toolchain = {
        'toolchain_name': 'yocto_native',
-        'is_clang': gn_clang_native(d),
        'current_cpu': gn_host_arch_name(d),
        'host_pkg_config': gn_host_pkg_config(d),
        'cc': d.expand('${BUILD_CC}'),
@ -109,7 +94,6 @@ 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}'),
--- a/recipes-qt/qt6/qmlcompilerplus_git.bb
+++ b/recipes-qt/qt6/qmlcompilerplus_git.bb
@ -1,8 +1,12 @@
-LICENSE = "The-Qt-Company-Commercial"
+LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
 "

 inherit qt6-cmake
--- a/recipes-qt/qt6/qt3d-examples_git.bb
+++ b/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 \
-"
--- a/recipes-qt/qt6/qt3d_git.bb
+++ b/recipes-qt/qt6/qt3d_git.bb
@ -1,10 +1,8 @@
-LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only) & BSD-3-Clause & MIT"
+LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GPL-3.0-only & GFDL-1.3-no-invariants-only) & BSD-3-Clause & MIT"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
-    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 \
    file://src/3rdparty/assimp/LICENSE;md5=2119edef0916b0bd511cb3c731076271 \
@ -19,6 +17,7 @@ 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"
--- a/recipes-qt/qt6/qt5compat-examples_git.bb
+++ b/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"
--- a/recipes-qt/qt6/qt5compat_git.bb
+++ b/recipes-qt/qt6/qt5compat_git.bb
@ -13,6 +13,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

 ENABLE_QMLCOMPILER = "0"
--- a/recipes-qt/qt6/qt6-commercial.inc
+++ b/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}"
--- a/recipes-qt/qt6/qt6-examples.inc
+++ b/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"
--- a/recipes-qt/qt6/qt6-git.inc
+++ b/recipes-qt/qt6/qt6-git.inc
@ -4,9 +4,9 @@ HOMEPAGE ?= "https://www.qt.io"
 inherit srcrev-update

 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "dev"
+QT_MODULE_BRANCH ?= "6.8"
 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}"
@ -17,59 +17,58 @@ CVE_PRODUCT ?= "qt:${BPN} qt:qt"

 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_tqtc-qmlcompilerplus = "cd4e27e17a3c66a6e7ad8cd201c5ba786db21409"
+SRCREV_tqtc-qtinsighttracker = "d329a7ae2998d54f0fd72d3a00248c14b6b0c828"
+SRCREV_tqtc-qtvncserver = "63ed12a2b0c65a9885afa6a3db085f3a7ea206bd"
+SRCREV_tqtc-pyside-setup = "b84c05f1549643d74e183ae542e9dfe023d2fcdc"
+SRCREV_qt3d = "971ad174b06d7aa15f5623d7a8e422afaaa0701d"
 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_qt5compat = "8b4daae823e808dbd46ffd190f5e8095590feb0a"
+SRCREV_qtbase = "cb8d7269e88a5b82fd4614de5893f088bdbee9e6"
+SRCREV_qtapplicationmanager = "9aec5b255fe1426304f5d76c4c217bca19f1ca13"
+SRCREV_qtcharts = "52e16389b43551fa72dcc2c3659db735673bfad8"
+SRCREV_qtcoap = "021defaf637b43337c5ed9095a11f8d98d492114"
+SRCREV_qtconnectivity = "48a37901bf7b7242eea7760303e0c4735bd3a5d2"
+SRCREV_qtdatavis3d = "241657f7b3d45fb05424509bd6f1c9e1903d0bba"
+SRCREV_qtdeclarative = "81e6f7a3dd6204c13e2e6776adeada7f07a58122"
+SRCREV_qtdeviceutilities = "07c9d69810a0e11e4d89891428e58ec447ed9567"
+SRCREV_qtdoc = "2a6bdf27cf6b2a8521aa459c18d918d1fa30fba5"
+SRCREV_qtgraphs = "c67fe88920ed588f67aedc3a600501f1ab0c71fc"
+SRCREV_qtgrpc = "3a980a147fe364981844da89b566d4d380d49fb7"
+SRCREV_qthttpserver = "303b3c398070266f9cde66e0b29d43da13019ab9"
+SRCREV_qtimageformats = "fe5fb62f208ff68d7779ab55f499993b637a19e2"
+SRCREV_qtinterfaceframework = "6371e7e6c302cf35306d1af481881696c6f7950d"
+SRCREV_qtlanguageserver = "9d174da93ab3248facd623ccee1fc78ef9af3f1a"
+SRCREV_qtlocation = "d5bb3e4680518642e338481eea817d3229c7f5cd"
+SRCREV_qtlottie = "a6786e73ea4aa2e1be7c52cf960d1511acd516e7"
+SRCREV_qtmqtt = "6b9a9c69e9e50798c1bd12aa5ce560909ad36956"
+SRCREV_qtmultimedia = "edfd287109e53106d181bcf7dded3fca0fc38d66"
+SRCREV_qtnetworkauth = "42a9052c6892b72fdaad6113704521b565607da6"
+SRCREV_qtopcua = "17999fa4017d517394b61d982a2248fcd6c498dd"
+SRCREV_qtpositioning = "e6a617918f5f7c191b4df22a98a6add6cea175b1"
+SRCREV_qtquick3d = "f1a15d276a5abae241bf10e2b135427988faa3e0"
+SRCREV_qtquick3d-assimp = "647f94648c0ae24b9c6684383a9dbbc0e2fc23b7"
+SRCREV_qtquick3dphysics = "1795cc861c76b731b5533a3e1028cbd51a5fe7bc"
 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_qtquicktimeline = "be6b781340dacb6d54a7fe5d99f93f3d657bdc5c"
+SRCREV_qtremoteobjects = "4124e794ac12563172962505d029aaed95a3ebcf"
+SRCREV_qtscxml = "a9163903ad672144ab41ca4e7e55ccc2f979bdb9"
+SRCREV_qtsensors = "ff6ad01aaa746590c11f83748eee7dc135f1c5c1"
+SRCREV_qtserialbus = "9a5fb8e30e4f5e1aad82961020d40a828fed890b"
+SRCREV_qtserialport = "460d2661367d46cb86b49acd023bcb494de8f6ce"
+SRCREV_qtshadertools = "9d4ccc6a0b418926eefba545b9dfe41a8ce35479"
+SRCREV_qtspeech = "c21080e81178d7132f18953b3f4ad2431fe4658a"
+SRCREV_qtsvg = "14022685b481daf133531983bde7fb5a18e55b4d"
+SRCREV_qttools = "6029f231ceb59d862ab47ad9488a411a60367f23"
 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_qttranslations = "a95bb01134d9c530d3128829e4e52ffc00277000"
+SRCREV_qtvirtualkeyboard = "a187e41a7165cd38ebb06198fc05a1c414a5c3b6"
+SRCREV_qtwayland = "717888af06469f5d2daac035da9b75f91035e02b"
+SRCREV_qtwebchannel = "df449cf5d44ffd3289f2c262fe70e4c55c26bf64"
+SRCREV_qtwebengine = "6f0b0d9ebd62e01ed1f99e36e948468c8b9bd206"
+SRCREV_qtwebengine-chromium = "c9acb79d317671fb5403856711fe1c5beaed803b"
+SRCREV_qtwebsockets = "e4f38351b1b63697099b59d597e5519f4c0058b0"
+SRCREV_qtwebview = "0d62edeee844ae8a2f67e9d2c840cf22f0286196"
--- a/recipes-qt/qt6/qt6-ptest.inc
+++ b/recipes-qt/qt6/qt6-ptest.inc
@ -29,11 +29,10 @@ EOF
        ${EXTRA_OECMAKE} \
        -DQT_BUILD_STANDALONE_TESTS=ON \
        -DQT_BUILD_EXAMPLES=OFF \
-        -DQT_ADDITIONAL_PACKAGES_PREFIX_PATH=${D}${prefix} \
+        -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 \
-        -DQT_FORCE_BUILTIN_TESTDATA=ON \
        ${S} \
        -Wno-dev
    ${CMAKE_VERBOSE} cmake --build ${B_PTEST} --target all
@ -49,6 +48,9 @@ EOF
                \) -exec sh -c '\
                    install -D "$1" "${D}${PTEST_PATH}${1#${B_PTEST}}" \
                ' _ {} \;
+
+            # tests may depend on files from sources
+            cp -r ${S}/tests/$tests ${D}${PTEST_PATH}/tests
        fi
    done

--- a/recipes-qt/qt6/qt6.inc
+++ b/recipes-qt/qt6/qt6.inc
@ -1,5 +1,12 @@
 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 +30,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 +85,9 @@ 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_LIBDIR}/sbom \
    ${QT6_INSTALL_MKSPECSDIR} \
    ${QT6_INSTALL_QMLDIR}/*.qmltypes \
    ${QT6_INSTALL_QMLDIR}/*/*.qmltypes \
@ -108,3 +120,8 @@ FILES:${PN}-staticdev += " \
    ${QT6_INSTALL_QMLDIR}/*/*/*/objects*/ \
    ${QT6_INSTALL_QMLDIR}/*/*/*/*/objects*/ \
 "
+
+FILES:${PN}-examples = " \
+    ${QT6_INSTALL_EXAMPLESDIR} \
+"
+RDEPENDS:${PN}-examples = "${PN}"
--- a/recipes-qt/qt6/qtapplicationmanager-examples_git.bb
+++ b/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 \
-"
--- a/recipes-qt/qt6/qtapplicationmanager_git.bb
+++ b/recipes-qt/qt6/qtapplicationmanager_git.bb
@ -11,18 +11,20 @@ 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:class-target = " qthttpserver"
 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[multi-process] = "-DFEATURE_am_multi_process=ON, -DFEATURE_am_multi_process=OFF, qtwayland qtwayland-native"
 PACKAGECONFIG[bubblewrap] = "-DFEATURE_am_bubblewrap_container=ON,-DFEATURE_am_bubblewrap_container=OFF,,bubblewrap"

 PACKAGECONFIG:class-native ??= "tools-only"
--- a/recipes-qt/qt6/qtbase-examples_git.bb
+++ b/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"
--- a/recipes-qt/qt6/qtbase/0003-Add-OE-specific-specs-for-clang-compiler.patch
+++ b/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"
--- a/recipes-qt/qt6/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch
+++ b/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
--- a/recipes-qt/qt6/qtbase_git.bb
+++ b/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,22 +6,20 @@ 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

 SRC_URI += "\
    file://0001-Add-linux-oe-g-platform.patch \
-    file://0003-Add-OE-specific-specs-for-clang-compiler.patch \
    file://0004-Fix-qt.toolchain.cmake-for-SDK-use.patch \
    file://0005-testlib-don-t-track-the-build-or-source-directories.patch \
 "
@ -43,12 +40,13 @@ 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} \
@ -58,13 +56,12 @@ 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)} \
+        bb.utils.contains('DISTRO_FEATURES', 'x11', 'gl', 'kms gbm gles2 eglfs', d), 'no-opengl', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
    linuxfb \
 "
+PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb', '', d)}"
+PACKAGECONFIG_KDE ?= "${@bb.utils.contains('DISTRO_FEATURES', 'kde', 'cups kms gbm sql-sqlite', '', d)}"
 PACKAGECONFIG_FONTS ?= ""
 PACKAGECONFIG_SYSTEM ?= ""
 PACKAGECONFIG_DISTRO ?= ""
@ -89,7 +86,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,17 +96,13 @@ 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)}"

 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"
@ -150,7 +142,6 @@ 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"

@ -258,11 +249,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 \
--- a/recipes-qt/qt6/qtcanvaspainter-examples_git.bb
+++ b/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 \
-"
--- a/recipes-qt/qt6/qtcanvaspainter_git.bb
+++ b/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"
--- a/recipes-qt/qt6/qtcharts-examples_git.bb
+++ b/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 \
-"
--- a/recipes-qt/qt6/qtcharts_git.bb
+++ b/recipes-qt/qt6/qtcharts_git.bb
@ -8,6 +8,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"
@ -15,3 +16,4 @@ DEPENDS += "qtbase"
 PACKAGECONFIG ?= "qml"
 PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"

+INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtcoap-examples_git.bb
+++ b/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 \
-"
--- a/recipes-qt/qt6/qtcoap_git.bb
+++ b/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"
+
--- a/recipes-qt/qt6/qtconnectivity-examples_git.bb
+++ b/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 \
-"
--- a/recipes-qt/qt6/qtconnectivity_git.bb
+++ b/recipes-qt/qt6/qtconnectivity_git.bb
@ -1,22 +1,21 @@
-LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause"
+LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
-    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
-    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
 "

 inherit qt6-cmake

 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc

 DEPENDS += "qtbase"

 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
 PACKAGECONFIG[bluez] = "-DFEATURE_bluez=ON,-DFEATURE_bluez=OFF,bluez5"
+PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtdeclarative-native"

 FILES:${PN}-tools = ""
--- a/recipes-qt/qt6/qtdatavis3d-examples_git.bb
+++ b/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 \
-"
--- a/recipes-qt/qt6/qtdatavis3d_git.bb
+++ b/recipes-qt/qt6/qtdatavis3d_git.bb
@ -9,8 +9,11 @@ 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"

 DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtdeclarative-examples_git.bb
+++ b/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 \
-"
--- a/recipes-qt/qt6/qtdeclarative_git.bb
+++ b/recipes-qt/qt6/qtdeclarative_git.bb
@ -13,6 +13,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 qtdeclarative-native qtlanguageserver qtsvg"
--- a/recipes-qt/qt6/qtdeviceutilities-examples_git.bb
+++ b/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"
--- a/recipes-qt/qt6/qtdeviceutilities_git.bb
+++ b/recipes-qt/qt6/qtdeviceutilities_git.bb
@ -11,8 +11,9 @@ 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 qtdeclarative-native"
+DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtvirtualkeyboard"
 RDEPENDS:${PN} = "connman"

--- a/recipes-qt/qt6/qtdoc-examples_git.bb
+++ b/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"
--- a/recipes-qt/qt6/qtdoc_git.bb
+++ b/recipes-qt/qt6/qtdoc_git.bb
@ -1,23 +1,43 @@
-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"
+LICENSE = "(The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only & 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/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/ISC.txt;md5=2494cdbaca137fd93842fe9702e9bc4d \
    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=caa060942f6b722bc4329d4195584c38 \
 "

 inherit qt6-cmake

 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc

-DEPENDS = "\
+DEPENDS += "\
    qtbase \
-    qtdeclarative \
-    qtdeclarative-native \
-    qttasktree \
+    qtcharts \
+    qtdeclarative qtdeclarative-native \
+    qtgraphs \
+    qtlocation \
+    qtmultimedia \
+    qtpositioning \
+    qtquick3d qtquick3d-native \
+    qtsensors \
+    qtshadertools-native \
+    qtsvg \
+    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"
+
+PACKAGECONFIG ?= "examples"

 INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtgraphs-examples_git.bb
+++ b/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 \
-"
--- a/recipes-qt/qt6/qtgraphs_git.bb
+++ b/recipes-qt/qt6/qtgraphs_git.bb
@ -10,6 +10,9 @@ 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 qtdeclarative-native qtquick3d qtquick3d-native"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtgrpc-examples_git.bb
+++ b/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"
--- a/recipes-qt/qt6/qtgrpc_git.bb
+++ b/recipes-qt/qt6/qtgrpc_git.bb
@ -11,6 +11,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 qtgrpc-native protobuf protobuf-native"
--- a/recipes-qt/qt6/qthttpserver-examples_git.bb
+++ b/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"
--- a/recipes-qt/qt6/qthttpserver_git.bb
+++ b/recipes-qt/qt6/qthttpserver_git.bb
@ -9,6 +9,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"
--- a/recipes-qt/qt6/qtimageformats_git.bb
+++ b/recipes-qt/qt6/qtimageformats_git.bb
@ -1,20 +1,19 @@
-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 & 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 \
 "

 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"
--- a/recipes-qt/qt6/qtinsighttracker-examples_git.bb
+++ b/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 \
-"
--- a/recipes-qt/qt6/qtinterfaceframework-examples_git.bb
+++ b/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"
--- a/recipes-qt/qt6/qtinterfaceframework_git.bb
+++ b/recipes-qt/qt6/qtinterfaceframework_git.bb
@ -11,6 +11,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

 FILES:${PN}-dev += " \
@ -28,3 +29,7 @@ PACKAGECONFIG[ifcodegen] = "-DFEATURE_ifcodegen=ON,-DFEATURE_ifcodegen=OFF,pytho
 PACKAGECONFIG[remoteobjects] = "-DFEATURE_remoteobjects=ON,-DFEATURE_remoteobjects=OFF,qtremoteobjects qtremoteobjects-native"

 BBCLASSEXTEND = "native nativesdk"
+
+PRIVATE_LIBS:${PN}-examples = "libInstrumentCluster.so"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtlanguageserver_git.bb
+++ b/recipes-qt/qt6/qtlanguageserver_git.bb
@ -1,15 +1,15 @@
-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) & 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"
--- a/recipes-qt/qt6/qtlocation-examples_git.bb
+++ b/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 \
-"
--- a/recipes-qt/qt6/qtlocation_git.bb
+++ b/recipes-qt/qt6/qtlocation_git.bb
@ -1,10 +1,8 @@
-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 & GFDL-1.3-no-invariants-only) & BSD-3-Clause & MIT"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
-    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 \
 "
@ -12,6 +10,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 qtpositioning"
--- a/recipes-qt/qt6/qtlottie_git.bb
+++ b/recipes-qt/qt6/qtlottie_git.bb
@ -8,13 +8,9 @@ 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 \
-    qtdeclarative-native \
-    qtlottie-native \
-"
+DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

-BBCLASSEXTEND = "native nativesdk"
+INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtmqtt-examples_git.bb
+++ b/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 \
-"
--- a/recipes-qt/qt6/qtmqtt_git.bb
+++ b/recipes-qt/qt6/qtmqtt_git.bb
@ -9,6 +9,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 qtwebsockets"
+
--- a/recipes-qt/qt6/qtmultimedia-examples_git.bb
+++ b/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 \
-"
--- a/recipes-qt/qt6/qtmultimedia_git.bb
+++ b/recipes-qt/qt6/qtmultimedia_git.bb
@ -1,10 +1,8 @@
-LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-3.0-only) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only ) & Apache-2.0 & BSD-3-Clause & MPL-2.0"
+LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GPL-3.0-only & GFDL-1.3-no-invariants-only ) & Apache-2.0 & BSD-3-Clause & MPL-2.0"
 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 \
    file://src/3rdparty/resonance-audio/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@ -16,6 +14,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 +24,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"
@ -35,3 +35,5 @@ PACKAGECONFIG[vaapi] = "-DFEATURE_vaapi=ON,-DFEATURE_vaapi=OFF,libva"

 QT_DEFAULT_MEDIA_BACKEND ?= "${@bb.utils.contains('PACKAGECONFIG', 'gstreamer', 'gstreamer', 'ffmpeg', d)}"
 EXTRA_OECMAKE += "-DQT_DEFAULT_MEDIA_BACKEND=${QT_DEFAULT_MEDIA_BACKEND}"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtnetworkauth-examples_git.bb
+++ b/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"
--- a/recipes-qt/qt6/qtnetworkauth_git.bb
+++ b/recipes-qt/qt6/qtnetworkauth_git.bb
@ -9,6 +9,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"
--- a/recipes-qt/qt6/qtopcua-examples_git.bb
+++ b/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 \
-"
--- a/recipes-qt/qt6/qtopcua_git.bb
+++ b/recipes-qt/qt6/qtopcua_git.bb
@ -22,6 +22,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

 PACKAGECONFIG ?= "qml open62541"
@ -38,3 +39,5 @@ SECURITY_STRINGFORMAT = ""
 DEPENDS += "qtbase qtopcua-native"

 BBCLASSEXTEND = "native nativesdk"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtpdf-examples_git.bb
+++ b/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 \
-"
-
--- a/recipes-qt/qt6/qtpositioning-examples_git.bb
+++ b/recipes-qt/qt6/qtpositioning-examples_git.bb
@ -1,19 +0,0 @@
-LICENSE = "(The-Qt-Company-Commercial | BSD-3-Clause) & Apache-2.0 & OFL-1.1"
-LIC_FILES_CHKSUM = " \
-    file://LICENSES/Apache-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
-    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
-    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
-    file://LICENSES/OFL-1.1.txt;md5=ff1fb0cdd81129f9f0c335a58802172f \
-"
-
-inherit qt6-cmake
-
-QT_MODULE = "qtpositioning"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "\
-    qtdeclarative-native \
-    qtpositioning \
-"
--- a/recipes-qt/qt6/qtpositioning_git.bb
+++ b/recipes-qt/qt6/qtpositioning_git.bb
@ -1,9 +1,10 @@
-LICENSE = "(The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only) & BSD-3-Clause & BSL-1.0 & MIT"
+LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GFDL-1.3-no-invariants-only) & BSD-3-Clause & BSL-1.0 & MIT"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
    file://src/3rdparty/clipper/LICENSE;md5=703fd70389dc10159a3da376b5480d52 \
    file://src/3rdparty/clip2tri/LICENSE;md5=20ada30cde771326c364b7987ff5585a \
    file://src/3rdparty/poly2tri/LICENSE;md5=ee547afd72a735d8f02ff92a09cfe403 \
@ -12,6 +13,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"
@ -21,3 +23,5 @@ PACKAGECONFIG[geoclue] = ",,,geoclue"
 PACKAGECONFIG[gypsy] = "-DFEATURE_gypsy=ON,-DFEATURE_gypsy=OFF,gconf gypsy"
 PACKAGECONFIG[nmea] = ",,qtserialport"
 PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtquick3d-examples_git.bb
+++ b/recipes-qt/qt6/qtquick3d-examples_git.bb
@ -1,21 +0,0 @@
-LICENSE = "(The-Qt-Company-Commercial | BSD-3-Clause) & CC0-1.0 & MIT"
-LIC_FILES_CHKSUM = " \
-    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
-    file://LICENSES/CC0-1.0.txt;md5=65d3616852dbf7b1a6d4b53b00626032 \
-    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
-    file://LICENSES/MIT.txt;md5=3605d54ecceddcd50962eb89318779ec \
-"
-
-inherit qt6-cmake
-
-QT_MODULE = "qtquick3d"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "\
-    qtdeclarative-native \
-    qtquick3d \
-    qtquick3d-native \
-"
-
--- a/recipes-qt/qt6/qtquick3d_git.bb
+++ b/recipes-qt/qt6/qtquick3d_git.bb
@ -17,6 +17,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

 ASSIMP_BRANCH = "qt6_assimp"
--- a/recipes-qt/qt6/qtquick3dphysics-examples_git.bb
+++ b/recipes-qt/qt6/qtquick3dphysics-examples_git.bb
@ -1,24 +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
-
-COMPATIBLE_MACHINE = "(-)"
-COMPATIBLE_MACHINE:aarch64 = "(.*)"
-COMPATIBLE_MACHINE:arm = "(.*)"
-COMPATIBLE_MACHINE:x86 = "(.*)"
-COMPATIBLE_MACHINE:x86-64 = "(.*)"
-
-QT_MODULE = "qtquick3dphysics"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "\
-    qtdeclarative-native \
-    qtquick3d-native \
-    qtquick3dphysics \
-"
--- a/recipes-qt/qt6/qtquick3dphysics_git.bb
+++ b/recipes-qt/qt6/qtquick3dphysics_git.bb
@ -11,6 +11,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

 COMPATIBLE_MACHINE = "(-)"
@ -22,3 +23,5 @@ COMPATIBLE_MACHINE:x86-64 = "(.*)"
 DEPENDS = "qtbase qtquick3d qtquick3d-native qtdeclarative-native"

 FILES:${PN}-tools = ""
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtquicktimeline_git.bb
+++ b/recipes-qt/qt6/qtquicktimeline_git.bb
@ -9,6 +9,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 qtdeclarative qtdeclarative-native"
--- a/recipes-qt/qt6/qtremoteobjects-examples_git.bb
+++ b/recipes-qt/qt6/qtremoteobjects-examples_git.bb
@ -1,19 +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 = "qtremoteobjects"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "\
-    qtconnectivity \
-    qtremoteobjects \
-    qtremoteobjects-native \
-    qtwebsockets \
-"
--- a/recipes-qt/qt6/qtremoteobjects_git.bb
+++ b/recipes-qt/qt6/qtremoteobjects_git.bb
@ -1,10 +1,8 @@
-LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause"
+LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & 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 \
 "
@ -12,6 +10,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 qtdeclarative qtremoteobjects-native"
--- a/recipes-qt/qt6/qtscxml-examples_git.bb
+++ b/recipes-qt/qt6/qtscxml-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 = "qtscxml"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "\
-    qtdeclarative-native \
-    qtscxml \
-    qtscxml-native \
-"
--- a/recipes-qt/qt6/qtscxml_git.bb
+++ b/recipes-qt/qt6/qtscxml_git.bb
@ -1,10 +1,8 @@
-LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause"
+LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & 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 \
 "
@ -12,6 +10,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 qtscxml-native"
--- a/recipes-qt/qt6/qtsensors-examples_git.bb
+++ b/recipes-qt/qt6/qtsensors-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 = "qtsensors"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "\
-    qtdeclarative-native \
-    qtsensors \
-    qtsvg \
-"
--- a/recipes-qt/qt6/qtsensors_git.bb
+++ b/recipes-qt/qt6/qtsensors_git.bb
@ -1,18 +1,17 @@
-LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause"
+LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
-    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
-    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
 "

 inherit qt6-cmake

 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc

 DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

+INSANE_SKIP:${PN}-ptest += "buildpaths"
--- a/recipes-qt/qt6/qtserialbus-examples_git.bb
+++ b/recipes-qt/qt6/qtserialbus-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 = "qtserialbus"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "qtserialbus"
--- a/recipes-qt/qt6/qtserialbus_git.bb
+++ b/recipes-qt/qt6/qtserialbus_git.bb
@ -1,17 +1,15 @@
-LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause"
+LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
-    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
-    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
 "

 inherit qt6-cmake

 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc

 DEPENDS += "qtbase"
--- a/Show More
+++ b/Show More
				`@ -0,0 +1,2 @@`
				`RDEPENDS:${PN}:append:pn-packagegroup-qt6-addons = " python3-pyside6"`