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

Change-Id: I4574d3002d456f877c8c06978418212da48a86c9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2026-01-01 13:58:07 +00:00 · 2025-10-02 09:33:06 +00:00 · 2025-10-02 07:00:54 +00:00 · 2025-09-30 00:17:52 +00:00 · 2025-09-26 15:13:49 +00:00 · 2025-09-26 02:11:37 +00:00
88 changed files with 308 additions and 1254 deletions
--- a/README.md
+++ b/README.md
@ -20,23 +20,22 @@ Following table shows the Yocto releases which are used to test each
 Qt version (x) and any additional Yocto releases that are stated in
 the LAYERSERIES_COMPAT (c).

-| Yocto \ Qt | dev | 6.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.10 | 6.9  | 6.8 | 6.7 | 6.6 | 6.5 | 6.4 | 6.3 | 6.2 |
+|:---------- |:----:|:----:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
+| whinlatter |  x   |  x   |  x  |     |     |     |     |     |     |
+| walnascar  |  x   |  x   |  x  |     |     |     |     |     |     |
+| styhead    |  x   |  x   |  x  |  c  |     |     |     |     |     |
+| scarthgap  |  x   |  x   |  x  |  c  |  c  |  x  |     |     |     |
+| nanbield   |  c   |  c   |  c  |  c  |  c  |  c  |     |     |     |
+| mickledore |  c   |  c   |  c  |  c  |  c  |  c  |  c  |     |     |
+| langdale   |  c   |  c   |  c  |  c  |  c  |  c  |  c  |     |     |
+| kirkstone  |  x   |  x   |  x  |  c  |  c  |  x  |  c  |  c  |  c  |
+| honister   |      |      |     |     |  c  |  c  |  c  |  c  |  c  |
+| hardknott  |      |      |     |     |  c  |  c  |  c  |  c  |  c  |
+| gatesgarth |      |      |     |     |  c  |  c  |  c  |  c  |  c  |
+| dunfell    |      |      |     |     |  c  |  x  |  c  |  c  |  c  |
+|            |      |      |     |     |     |     |     |     |     |
+|            |stable|stable| LTS | EOL | EOL | LTS | EOL | EOL | EOL |

 Detailed status of supported Qt versions can be found from
 https://doc.qt.io/qt-6/supported-platforms.html#supported-qt-versions
--- 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
  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
  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
  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
  enable_if:
      condition: property
      property: target.arch
@ -100,46 +95,14 @@ target5: &target5
      variableValue: qemuarm64
    - type: EnvironmentVariable
      variableName: MANIFEST
-      variableValue: scarthgap.xml
+      variableValue: kirkstone.xml
    - type: EnvironmentVariable
      variableName: TEST_CONFIGS
-      variableValue: ci configs wayland opengl static
+      variableValue: ci configs wayland static no-webengine
  enable_if:
      condition: property
      property: target.arch
      equals_value: TARGET5
-target6: &target6
-  type: Group
-  instructions:
-    - type: EnvironmentVariable
-      variableName: MACHINE
-      variableValue: qemuarm64
-    - type: EnvironmentVariable
-      variableName: MANIFEST
-      variableValue: master.xml
-    - type: EnvironmentVariable
-      variableName: TEST_CONFIGS
-      variableValue: ci configs x11
-  enable_if:
-      condition: property
-      property: target.arch
-      equals_value: TARGET6
-target7: &target7
-  type: Group
-  instructions:
-    - type: EnvironmentVariable
-      variableName: MACHINE
-      variableValue: qemuarm64
-    - type: EnvironmentVariable
-      variableName: MANIFEST
-      variableValue: master.xml
-    - type: EnvironmentVariable
-      variableName: TEST_CONFIGS
-      variableValue: ci configs wayland x11 opengl clang
-  enable_if:
-      condition: property
-      property: target.arch
-      equals_value: TARGET7

 instructions:
  Build:
@ -148,8 +111,6 @@ instructions:
  - *target3
  - *target4
  - *target5
-  - *target6
-  - *target7
  - type: EnvironmentVariable
    variableName: DL_DIR
    variableValue: "/mnt/yocto-cache/downloads"
@ -183,20 +144,7 @@ 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
@ -208,10 +156,7 @@ instructions:
      done

      # build toolchain which should include all supported recipes
-      bitbake meta-toolchain-qt6 \
-          nativesdk-packagegroup-qt6-toolchain-host \
-          packagegroup-qt6-modules \
-          packagegroup-qt6-examples
+      bitbake meta-toolchain-qt6 nativesdk-packagegroup-qt6-toolchain-host packagegroup-qt6-modules
    filename: "{{.BuildDir}}/start-build"
    fileMode: 420
  - type: ExecuteCommand
--- 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"

@ -41,16 +40,63 @@ PREFERRED_ARM_INSTRUCTION_SET              ?= "thumb"
 ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}"

 # enable webengine with commercial/proprietary features
+DISTRO_FEATURES:append = " webengine"
 PACKAGECONFIG:append:pn-qtwebengine = " proprietary-codecs"

 PACKAGECONFIG:append:pn-qtbase = "\
-    tslib libproxy gssapi mtdev cups ctf \
+    tslib kms gbm zstd libproxy gssapi vulkan mtdev cups \
    sql-mysql sql-odbc sql-psql sql-sqlite journald brotli \
    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
 "

-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-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,12 @@ 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.10.0"

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

 QT_COMMERCIAL_MODULES ?= "0"
+
+# License mapping back to old license files
+SPDXLICENSEMAP[GFDL-1.3-no-invariants-only] = "GFDL-1.3"
--- 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-multimedia/webp/libwebp_%.bbappend
+++ b/recipes-multimedia/webp/libwebp_%.bbappend
@ -0,0 +1 @@
+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,8 +11,6 @@ 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 \
--- a/recipes-qt/packagegroups/packagegroup-qt6-addons.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt6-addons.bb
@ -11,7 +11,6 @@ RDEPENDS:${PN} += " \
    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d', '', d)} \
    qt5compat \
    qtapplicationmanager \
-    qtcanvaspainter \
    qtcharts \
    qtcoap \
    qtconnectivity \
@ -42,7 +41,6 @@ RDEPENDS:${PN} += " \
    qtshadertools \
    qtspeech \
    qtsvg \
-    qttasktree \
    qttranslations \
    qtvirtualkeyboard \
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
@ -74,5 +72,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-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/qt-gn-native_git.bb
+++ b/recipes-qt/qt6/qt-gn-native_git.bb
--- 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/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/qt6-commercial.inc
+++ b/recipes-qt/qt6/qt6-commercial.inc
@ -5,4 +5,4 @@ python() {

 QT_GIT = "${QT_COMMERCIAL_GIT}"
 QT_GIT_PROTOCOL = "${QT_COMMERCIAL_GIT_PROTOCOL}"
-QT_MODULE_REPO = "tqtc-${QT_MODULE}"
+QT_MODULE = "tqtc-${BPN}"
--- 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.10"
 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,57 @@ 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 = "f1ce4d22b4cc8534e7887225939cc00d5bb4c41c"
+SRCREV_tqtc-qtinsighttracker = "baf5d40dc7aa359afbfeafa927cedd2b1d4b38b9"
+SRCREV_tqtc-qtvncserver = "4dd14fb264bff79e501184ae478668f098e25d89"
+SRCREV_qt3d = "de888c732f6bea7c573e9e1b6f4a94758d649c11"
 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_qt5compat = "2bdf215e94f2c108b89c0665570f0ea33647c8c1"
+SRCREV_qtbase = "5a8637e4516bc48a0b3f4b5ec3b18618b92e7222"
+SRCREV_qtapplicationmanager = "5ce3d6b67b713c3e29bde9b171e6b4ba6ab9fab3"
+SRCREV_qtcharts = "a8e93cce32cb2b7c26e91d1bfdeccc1c5c7f7cdb"
+SRCREV_qtcoap = "fbc83778675a49583216dc22e2fa76e2dab8b8fe"
+SRCREV_qtconnectivity = "31cad98e9bd2b6cd67d35f0f0acf71ca15c3ac65"
+SRCREV_qtdatavis3d = "b2396bd8d18724ee735ae3bbe687b8560f01ebff"
+SRCREV_qtdeclarative = "7e0ab1d98c159c9f4c9afab78b43e7c70f449e41"
+SRCREV_qtdeviceutilities = "e98ca00d6bc85f879114def272df4d25f125055e"
+SRCREV_qtdoc = "4c088d092ade87dd27550bdfde5548535e9c7cca"
+SRCREV_qtgraphs = "4e18609678b777f7e7ce47c17764e46c20bfb608"
+SRCREV_qtgrpc = "ec458d439f1eafa2b33684b0d4a39389d7c0e12e"
+SRCREV_qthttpserver = "2dcbb15e7b0c08d420924a02f5431d8e4ed407f3"
+SRCREV_qtimageformats = "3e83e4452a3437f95b9fb6c72bf6b69407c1a592"
+SRCREV_qtinterfaceframework = "d2468daa889a7508e4df49425ff9ecc172d518d8"
+SRCREV_qtlanguageserver = "e4de04e86255802a0862c0b4694eac0065f6c73e"
+SRCREV_qtlocation = "06051e45b8e7512563fa609df61861fe3de15058"
+SRCREV_qtlottie = "cedbb382b0f31e005d0ba906dd6ed3da6b97fca7"
+SRCREV_qtmqtt = "d18c7571f295cd17e32ca084e8b05c50f21feba0"
+SRCREV_qtmultimedia = "9f1cc9b35c0916084f6835f78b665a3b4e3fe4f9"
+SRCREV_qtnetworkauth = "ff34e1ae68601b3437a7fd6eef412894b08dd0c0"
+SRCREV_qtopcua = "a6d900e088f23cbd159668893a40e87e3d03a07e"
+SRCREV_qtpositioning = "cded370ab2518be232ae412e3bb8bc7ff8423be2"
+SRCREV_qtquick3d = "ede89c1c2d4d423c702692b645c52eca9cbfaa4c"
 SRCREV_qtquick3d-assimp = "488a2f7af2920295ada886f113a0d563dab79b8d"
-SRCREV_qtquick3dphysics = "9c860d931ef38751a1bc03ef813610dbd7793469"
+SRCREV_qtquick3dphysics = "272129cfeb29502a5d1a38ec0f0012a81e9968dd"
 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 = "9a91c7ae13089d831fc89d9c4d8bd8418307a80e"
+SRCREV_qtremoteobjects = "c200d8c5b3de18ea1497066f74f56fdf7cd42396"
+SRCREV_qtscxml = "4d8a8fa98dba2370c424c8a16282e812bef27dbc"
+SRCREV_qtsensors = "33205facb4c0ce9dbfdf906db4fb81627561bba5"
+SRCREV_qtserialbus = "5b1a3e616a76d3bcd4da49aef09553b8e9c0eb40"
+SRCREV_qtserialport = "63c618b07d7a78905a48eaf685051898d932cb69"
+SRCREV_qtshadertools = "7b064b6e4fb2e57a6f78666532382bbb5e38be91"
+SRCREV_qtspeech = "16bc9d9b74145b17e68529ca872a81f5b8a679d5"
+SRCREV_qtsvg = "ad1cee1d8cf7ab05dc779306668ef16fa600faed"
+SRCREV_qttools = "f33c4bb1dee569eec4ffe1333584cb4b75af6c59"
 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 = "91b4ea2921e9b935da03096008ad23d44801d6e7"
+SRCREV_qtvirtualkeyboard = "9e4ded6aefb3edc0c65eebd34f45ec3b7b64e66e"
+SRCREV_qtwayland = "4a35a78b817112a212779c4edcc247b166971017"
+SRCREV_qtwebchannel = "5fa346005c6a0aa6ae4cd1c65947424c29bcdeef"
+SRCREV_qtwebengine = "08cfa1af1eaa001a731e21bee336f09677a9c88a"
+SRCREV_qtwebengine-chromium = "37c43c72fdfb245e6340794995b3f787bdd6221c"
+SRCREV_qtwebsockets = "a81ae8a7ca0f152e1d30dcf70cc65a63e8fd5c36"
+SRCREV_qtwebview = "293f95f9cfcdbfac60f8276ad5f50d234257557f"
--- 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
@ -14,12 +14,13 @@ include recipes-qt/qt6/qt6-git.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"
--- 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_git.bb
+++ b/recipes-qt/qt6/qtbase_git.bb
@ -15,14 +15,13 @@ LIC_FILES_CHKSUM = " \
    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.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 \
 "
@ -49,6 +48,8 @@ PACKAGECONFIG:class-nativesdk ?= "${PACKAGECONFIG:class-native}"
 PACKAGECONFIG ?= "\
    ${PACKAGECONFIG_DEFAULT} \
    ${PACKAGECONFIG_GRAPHICS} \
+    ${PACKAGECONFIG_X11} \
+    ${PACKAGECONFIG_KDE} \
    ${PACKAGECONFIG_FONTS} \
    ${PACKAGECONFIG_SYSTEM} \
    ${PACKAGECONFIG_DISTRO} \
@ -58,13 +59,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 ?= ""
@ -100,17 +100,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"
@ -258,10 +254,7 @@ isEmpty(QMAKE_CC): {
 EOF
 }

-FILES:${PN}-dev += "\
-    ${datadir}/qt6/wayland \
-    ${datadir}/qt6/json_schema \
-"
+FILES:${PN}-dev += "${datadir}/qt6/wayland"

 INSANE_SKIP:${PN}-ptest += "arch"
 INHIBIT_PACKAGE_STRIP_FILES = "\
--- 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/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
@ -13,3 +13,6 @@ include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc

 DEPENDS += "qtbase"
+
+PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtdeclarative-native"
+
--- 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
@ -18,5 +18,6 @@ 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/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/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
@ -13,6 +13,6 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc

-DEPENDS = "qtbase qtdeclarative qtdeclarative-native"
+DEPENDS = "qtbase qtdeclarative qtdeclarative-native 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,10 +1,12 @@
-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 \
 "

@ -13,11 +15,30 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.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 \
+    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"
+
+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/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
@ -18,6 +18,9 @@ DEPENDS += "qtbase qtgrpc-native protobuf protobuf-native"
 PACKAGECONFIG ?= "qml"
 PACKAGECONFIG[qml] = "-DFEATURE_grpcquick=ON,-DFEATURE_grpcquick=OFF,qtdeclarative qtdeclarative-native"

+# workaround for missing protobuf support on kirkstone
+ALLOW_EMPTY:${PN}-tools = "1"
+
 BBCLASSEXTEND = "native nativesdk"

 INSANE_SKIP:${PN}-ptest += "buildpaths"
--- 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/qtimageformats_git.bb
+++ b/recipes-qt/qt6/qtimageformats_git.bb
@ -14,7 +14,7 @@ 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
@ -28,3 +28,5 @@ 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"
--- 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/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
@ -12,3 +12,6 @@ include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc

 DEPENDS += "qtbase"
+
+PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtdeclarative-native qtwebsockets"
+
--- 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
@ -25,6 +25,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"
--- 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/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/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/qtpdf_git.bb
+++ b/recipes-qt/qt6/qtpdf_git.bb
@ -8,7 +8,7 @@ DEPENDS += " \
    bison-native \
    nss nss-native \
    qtbase qtdeclarative qtdeclarative-native \
-    qt-gn-native \
+    gn-native \
    libxkbcommon \
    python3-html5lib-native \
 "
--- 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/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/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/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/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/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/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/qtserialport-examples_git.bb
+++ b/recipes-qt/qt6/qtserialport-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 = "qtserialport"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "qtserialport"
--- a/recipes-qt/qt6/qtspeech-examples_git.bb
+++ b/recipes-qt/qt6/qtspeech-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 = "qtspeech"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "\
-    qtdeclarative-native \
-    qtspeech \
-"
--- a/recipes-qt/qt6/qtspeech_git.bb
+++ b/recipes-qt/qt6/qtspeech_git.bb
@ -15,9 +15,6 @@ include recipes-qt/qt6/qt6.inc

 DEPENDS += "qtbase qtmultimedia"

-PACKAGECONFIG ?= "\
-    qml \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'multimedia-layer', 'flite', '', d)} \
-"
+PACKAGECONFIG ?= "qml"
 PACKAGECONFIG[flite] = "-DFEATURE_flite=ON,-DFEATURE_flite=OFF,flite"
 PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
--- a/recipes-qt/qt6/qttasktree-examples_git.bb
+++ b/recipes-qt/qt6/qttasktree-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 = "qttasktree"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "qttasktree"
--- a/recipes-qt/qt6/qttasktree_git.bb
+++ b/recipes-qt/qt6/qttasktree_git.bb
@ -1,16 +0,0 @@
-LICENSE = "The-Qt-Company-Commercial | (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause"
-LIC_FILES_CHKSUM = " \
-    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
-    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
-    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
-"
-
-inherit qt6-cmake
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6.inc
-
-DEPENDS += "qtbase"
--- a/recipes-qt/qt6/qttools-examples_git.bb
+++ b/recipes-qt/qt6/qttools-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 = "qttools"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-SRC_URI += "file://0001-examples-don-t-track-source-path.patch"
-
-DEPENDS += "\
-    qttools \
-    qttools-native \
-"
--- a/recipes-qt/qt6/qttools/0002-examples-don-t-track-source-path.patch
+++ b/recipes-qt/qt6/qttools/0002-examples-don-t-track-source-path.patch
--- a/recipes-qt/qt6/qttools_git.bb
+++ b/recipes-qt/qt6/qttools_git.bb
@ -20,6 +20,7 @@ include recipes-qt/qt6/qt6.inc
 SRC_URI += " \
    ${QT_GIT}/playground/qlitehtml.git;name=qttools-qlitehtml;branch=master;protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/assistant/qlitehtml \
    git://github.com/litehtml/litehtml.git;name=qttools-qlitehtml-litehtml;branch=master;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/assistant/qlitehtml/src/3rdparty/litehtml;protocol=https \
+    file://0002-examples-don-t-track-source-path.patch \
 "

 DEPENDS += "qtbase qtdeclarative qttools-native"
--- a/recipes-qt/qt6/qtvirtualkeyboard-examples_git.bb
+++ b/recipes-qt/qt6/qtvirtualkeyboard-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 = "qtvirtualkeyboard"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "\
-    qtdeclarative-native \
-    qtmultimedia \
-    qtvirtualkeyboard \
-"
--- a/recipes-qt/qt6/qtvncserver-examples_git.bb
+++ b/recipes-qt/qt6/qtvncserver-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 = "qtvncserver"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-include recipes-qt/qt6/qt6-commercial.inc
-
-DEPENDS += "\
-    qtdeclarative-native \
-    qtvncserver \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
-"
--- a/recipes-qt/qt6/qtvncserver_git.bb
+++ b/recipes-qt/qt6/qtvncserver_git.bb
@ -13,5 +13,5 @@ include recipes-qt/qt6/qt6-commercial.inc

 DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

-PACKAGECONFIG ?= "libtomcrypt"
+PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtwayland"
 PACKAGECONFIG[libtomcrypt] = ",,libtomcrypt"
--- a/recipes-qt/qt6/qtwayland-examples_git.bb
+++ b/recipes-qt/qt6/qtwayland-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 = "wayland"
-
-QT_MODULE = "qtwayland"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "\
-    qtdeclarative-native \
-    qtwayland \
-"
--- a/recipes-qt/qt6/qtwebchannel-examples_git.bb
+++ b/recipes-qt/qt6/qtwebchannel-examples_git.bb
@ -1,21 +0,0 @@
-LICENSE = "The-Qt-Company-Commercial | BSD-3-Clause & (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/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
-
-QT_MODULE = "qtwebchannel"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "\
-    qtdeclarative-native \
-    qtwebchannel \
-    qtwebsockets \
-"
--- a/recipes-qt/qt6/qtwebchannel_git.bb
+++ b/recipes-qt/qt6/qtwebchannel_git.bb
@ -16,10 +16,7 @@ include recipes-qt/qt6/qt6.inc
 DEPENDS += "qtbase"

 PACKAGECONFIG ?= "qml"
+PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtwebsockets"
 PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"

-FILES:${PN} += "\
-    ${datadir}/qt6/webchannel/qwebchannel.js \
-"
-
 INSANE_SKIP:${PN}-examples += "buildpaths"
--- a/recipes-qt/qt6/qtwebengine-examples_git.bb
+++ b/recipes-qt/qt6/qtwebengine-examples_git.bb
@ -1,32 +0,0 @@
-LICENSE = "(The-Qt-Company-Commercial | BSD-3-Clause) & Apache-2.0 & LicenseRef-Tango-Icons-Public-Domain & MIT"
-LIC_FILES_CHKSUM = " \
-    file://LICENSES/Apache-2.0.txt;md5=b4c615f64dff32f71eeed614d13dfd4c \
-    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
-    file://LICENSES/LicenseRef-Tango-Icons-Public-Domain.txt;md5=b66026716fdf499434f80b11851a6cdd \
-    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
-    file://LICENSES/MIT.txt;md5=3605d54ecceddcd50962eb89318779ec \
-"
-NO_GENERIC_LICENSE[LicenseRef-Tango-Icons-Public-Domain] = "LICENSES/LicenseRef-Tango-Icons-Public-Domain.txt"
-
-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 \
-    qtwebengine \
-"
--- a/recipes-qt/qt6/qtwebengine.inc
+++ b/recipes-qt/qt6/qtwebengine.inc
@ -36,6 +36,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/qtwebengine:"
 SRC_URI += " \
    ${QT_GIT}/${QT_GIT_PROJECT}/qtwebengine-chromium.git;name=qtwebengine-chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/src/3rdparty \
    file://0001-CMake-use-generated-yocto-toolchains.patch \
+    file://0002-Enable-examples.patch \
 "

 SRC_URI += " \
--- a/recipes-qt/qt6/qtwebengine/0002-Enable-examples.patch
+++ b/recipes-qt/qt6/qtwebengine/0002-Enable-examples.patch
@ -0,0 +1,26 @@
+From 221aefe4d8777f45955cb100dfc4c7204c885a19 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Tue, 31 Aug 2021 18:27:48 +0300
+Subject: [PATCH] Enable examples
+
+The bug mentioned does not affect bitbake builds.
+
+Change-Id: I076763d9241061f9cdb4d46bcd88e46bd4f783aa
+Upstream-Status: Inappropriate [OE Specific]
+---
+ examples/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index ccad90e11..32cd6d69d 100644
+--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ cmake_minimum_required(VERSION 3.16)
+ 
+ qt_examples_build_begin(EXTERNAL_BUILD)
+-if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533
+if(TRUE) #QTBUG-86533
+     if(TARGET Qt::WebEngineCore)
+         add_subdirectory(webenginequick)
+     endif()
--- a/recipes-qt/qt6/qtwebengine_git.bb
+++ b/recipes-qt/qt6/qtwebengine_git.bb
@ -9,7 +9,7 @@ DEPENDS += " \
    qemu-native \
    nss nss-native \
    qtbase qtdeclarative qtdeclarative-native \
-    qt-gn-native \
+    gn-native \
    python3-html5lib-native \
 "

--- a/recipes-qt/qt6/qtwebsockets-examples_git.bb
+++ b/recipes-qt/qt6/qtwebsockets-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 = "qtwebsockets"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "qtwebsockets"
--- a/recipes-qt/qt6/qtwebview-examples_git.bb
+++ b/recipes-qt/qt6/qtwebview-examples_git.bb
@ -1,28 +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 = "qtwebview"
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6-examples.inc
-
-DEPENDS += "\
-    qtdeclarative-native \
-    qtwebview \
-"
--- a/recipes-qt/qt6/qtwebview_git.bb
+++ b/recipes-qt/qt6/qtwebview_git.bb
@ -16,7 +16,6 @@ include recipes-qt/qt6/qt6.inc
 DEPENDS += "qtbase qtdeclarative qtdeclarative-native qtwebengine"

 COMPATIBLE_MACHINE = "(-)"
-COMPATIBLE_MACHINE:libc-musl = "(-)"
 COMPATIBLE_MACHINE:aarch64 = "(.*)"
 COMPATIBLE_MACHINE:armv6 = "(.*)"
 COMPATIBLE_MACHINE:armv7a = "(.*)"
Author	SHA1	Message	Date
Qt Submodule Update Bot	1a7a776c9f	Update submodule refs on '6.10.0' in yocto/meta-qt6 Change-Id: I4574d3002d456f877c8c06978418212da48a86c9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-10-02 09:33:06 +00:00
Qt Submodule Update Bot	648f00c6ef	Update submodule refs on '6.10.0' in yocto/meta-qt6 Change-Id: I12b1a16d738f8a084f5492b6d5b2bc05c74da62b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-10-02 07:00:54 +00:00
Qt Submodule Update Bot	0372d2854d	Update submodule refs on '6.10.0' in yocto/meta-qt6 Change-Id: Id9d1f291e97fcae69387eb81d3f9e36ab0d3726c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-09-30 00:17:52 +00:00
Qt Submodule Update Bot	2585a0658d	Update submodule refs on '6.10.0' in yocto/meta-qt6 Change-Id: I986263db94cc8c72b1ef42036b5e6fdd0c71f927 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-09-26 15:13:49 +00:00
Qt Submodule Update Bot	315f162796	Update submodule refs on '6.10.0' in yocto/meta-qt6 Change-Id: I1b44a2f9d8b6a293ffda869ac1e48edebf62baf1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-09-26 02:11:37 +00:00
Qt Submodule Update Bot	16797fcbcd	Update submodule refs on '6.10.0' in yocto/meta-qt6 Change-Id: Ib2f974b871c2b99c43b7247dcfbcd058f6ef9538 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-09-18 04:04:31 +00:00
Qt Submodule Update Bot	8f9ccdf1ae	Update submodule refs on '6.10.0' in yocto/meta-qt6 Change-Id: Icb0b1d675e3b3733b586d1ccda4c7e1d3d691c58 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-09-16 17:00:10 +00:00
Samuli Piippo	99d5b7b227	qttools: don't fail on unsupported clang oe-core might have too recent version of clang which is not supported by qttools. Don't force qttools to use clang, but let it determine if the version is suitable. Change-Id: I8a141ec01f3556d33b3037ba27adc250b99855b5 Reviewed-by: Ari Parkkila <ari.parkkila@qt.io> (cherry picked from commit `4df44780d1`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit `fb8737c59a`)	2025-09-13 09:05:05 +00:00
Qt Submodule Update Bot	961608702d	Update submodule refs on '6.10' in yocto/meta-qt6 Change-Id: I5234ff93b054bf6f7342b709a7fafca8a61af327 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-09-04 04:36:05 +00:00
Qt Submodule Update Bot	b17123f17c	Update submodule refs on '6.10' in yocto/meta-qt6 Change-Id: I1a2be64c61ca6328fff3e28f7781de2df7585848 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-09-03 03:28:47 +00:00
Qt Submodule Update Bot	e420ff9c1f	Update submodule refs on '6.10' in yocto/meta-qt6 Change-Id: I1a5aed678033791f4ee8246e0d9a06ae4e1c94cf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-08-31 03:13:07 +00:00
Qt Submodule Update Bot	0ecee187c5	Update submodule refs on '6.10' in yocto/meta-qt6 Change-Id: Ia049c566cd002eba4fdae1a842d3e6f0afbd1464 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-08-26 02:00:05 +00:00
Mikko Gronoff	918af8bccf	qtwebengine: update revision Change-Id: If7479e189f6a478c9514e2486daadffe6af95866 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>	2025-08-25 14:22:48 +03:00
Andreas Cord-Landwehr	ab45628fb8	qtbase: remove obsolete 'sm' option from kde DISTRO_FEATURES Fixes: QTBUG-138689 Pick-to: 6.9 6.8 Change-Id: I6f17220dfbe9b894a7080d3c66ffae06ab688042 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit `6643b50720`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-08-19 08:24:43 +00:00
Samuli Piippo	2a3492170c	conf: remove qtcreator image feature This is left over from meta-qt5 and has never been supported in meta-qt6. Pick-to: 6.9 6.8 Task-number: QTBUG-138741 Change-Id: I05aa1ef540ccd0665b386fd1a72238fefa0fd5e0 Reviewed-by: Ari Parkkila <ari.parkkila@qt.io> (cherry picked from commit `6ed2aff39a`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-08-19 08:24:32 +00:00
Samuli Piippo	c965250045	qtwebview: Match features_check with qtwebengine qtwebview has dependency to qtwebengine and is subject to the same opengl DISTRO_FEATURES requirement. Task-number: QTBUG-138741 Pick-to: 6.9 6.8 Change-Id: I0671c0bf5d115d2596742db0348ec9e1b30dc96a Reviewed-by: Ari Parkkila <ari.parkkila@qt.io> (cherry picked from commit `3080ebe00c`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-08-19 08:24:25 +00:00
Samuli Piippo	07586f564e	minizip: Update to match S/UNPACKDIR changes Extract the source to expected location and append minizip's subdir to S. This supports the S/UNPACKDIR changes done in oe-core/whinlatter and keeps backwards compatibility with older yocto versions. Pick-to: 6.9 6.8 Change-Id: I10942cc8ca337b321bf80f06661ab83cb4b20c35 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Ari Parkkila <ari.parkkila@qt.io> (cherry picked from commit `3767a12b99`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-08-19 08:24:01 +00:00
Samuli Piippo	1036144cce	ptest: include possible test plugins and qml modules Some of the Qt modules have separate test plugins and qml modules that are used in the auto tests. Pick-to: 6.9 6.8 Fixes: QTBUG-138066 Change-Id: I00c41396b59f1b380696bbab3489bd93b4a65cc5 Reviewed-by: Ari Parkkila <ari.parkkila@qt.io> (cherry picked from commit `8c8ec98428`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-08-19 08:23:49 +00:00
Qt Submodule Update Bot	cef0ed9298	Update submodule refs on '6.10' in yocto/meta-qt6 Change-Id: I1ef7f70280f728c4d3a9034abdf3b15fc6f95e1d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-08-18 08:40:31 +00:00
Mikko Gronoff	5277e44104	qtwebengine: update patches Update patches upon chromium update from 130-based to 134-based. Change-Id: Id9c9402182328e9d1c55e9ef2bc45ff1efe5ab9e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2025-08-12 19:36:06 +03:00
Mikko Gronoff	ea39e1e269	qtlanguageserver: update license Change-Id: I39896ad3ef6926b0b5f0e64d0902e980450ff7b3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2025-08-12 19:36:02 +03:00
Mikko Gronoff	b2cf2f1ce2	qtwebengine: update chromium branch chromium updated 130-based -> 134-based. Change-Id: I821083a88d67539c9ef1cf5ee366e2afb7473c13 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2025-08-12 19:35:58 +03:00
Samuli Piippo	eeac1077ad	qtlottie: remove patch Merged into upstream. Change-Id: I9f8bd8e1aa8b7e419b639c512fc790fb61a1e55e Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>	2025-08-12 16:35:53 +00:00
Qt Submodule Update Bot	2c75f76745	Update submodule refs on '6.10' in yocto/meta-qt6 Change-Id: Ie97bd9768155a77145a1d385eb58ece290ff06f9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-08-12 16:35:48 +00:00
Samuli Piippo	d30912ed91	qtbase: remove egl dependency from kms packageconfig The kms feature can be used without egl. Pick-to: 6.9 6.8 Change-Id: I99a50f821825d69fee5afb4982b78267809ddd7b Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit `16a1a08c07`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-07-09 09:24:08 +00:00
Mikko Gronoff	9ea636c054	qtpositioning: update license Change-Id: I78113f46c5bddfa95e25c6433ae9ce8c42917eed Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>	2025-07-04 07:37:10 +03:00
Qt Submodule Update Bot	d72a21229d	Update submodule refs on '6.10' in yocto/meta-qt6 Change-Id: I9122a16f5037ab86b8aa1ba72cb5625078c32a9f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-07-04 04:37:02 +00:00
Andreas Schirm	c7ab4a0b45	qtbase: add option to ignore at-spi2-core dependency Introduce a PACKAGECONFIG option in qtbase to allow disabling the at-spi2-core dependency. By default, the at-spi2-core dependency remains enabled. Pick-to: 6.9 6.8 Change-Id: Id2f0da1e3dfc049bf2e3d37bb1c096c41c4d4088 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit `c616e9de62`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-07-03 09:11:06 +00:00
Samuli Piippo	b301123406	qtlottie: update patch Update patch to apply to latest revision. Change-Id: I75b61661f34868395c90ce4c1d1aa994f1184a48 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>	2025-07-01 04:36:38 +00:00
Qt Submodule Update Bot	78d1d9200d	Update submodule refs on '6.10' in yocto/meta-qt6 Change-Id: Ifd86cc80861a85a8f582db7420ca348db4a1d6ca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-07-01 04:36:20 +00:00
Samuli Piippo	40b0a47183	qtapplicationmanager: add PACKAGECONFIG for bubblewrap The bubblewrap container uses the bubblewrap utility to create a new kernel namespace and runs the requested binary in this sandbox isolated from the rest of the system. Pick-to: 6.9 6.8 Fixes: QTBUG-13696 Change-Id: Ide2e631f797e2e8162375b4bbc60d81600243be2 Reviewed-by: Ari Parkkila <ari.parkkila@qt.io> (cherry picked from commit `76078809ef`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-06-30 06:06:57 +00:00
Samuli Piippo	51e2f41200	qtlottie: fix example build Add temporary fix for building examples. Change-Id: Ib205f2793894322e957f806531086b6730a63569 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit `a4a8751d3b`)	2025-06-30 06:06:45 +00:00
Samuli Piippo	6681292725	qtlottie: add support for lottietoqml tool lottietoqml tool converts from Lottie files to QML files using the VectorImage generator. Change-Id: I4ca699372300dcfef771b75e7f4c30fdfad182dd Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit `b5de66d6c3`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-06-30 06:06:33 +00:00
Samuli Piippo	7fcc914272	Revert "qtbase: fix build" Patches have been merged in qtbase. This reverts commit `a9be703b3b`. Change-Id: If37f9fd626fef24d27b160bd576c8d6c404d5461 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>	2025-06-30 06:06:10 +00:00
Qt Submodule Update Bot	bf6c5875db	Update submodule refs on '6.10' in yocto/meta-qt6 Change-Id: Ic15c0adf096c7268e9814d2631c81207d9dc7493 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-06-30 06:05:54 +00:00
Samuli Piippo	223a5cb11f	README: add support details for Qt 6.10 Change-Id: I521c6f1079a270a1188fbbc46182634675f34343 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>	2025-06-30 06:05:33 +00:00
Samuli Piippo	97fb6b019e	layer: add whinlatter to layer series For the next Yocto 5.3 release. Pick-to: 6.9 6.8 Change-Id: I9b88615f69bba56656829b39b12b751677aad399 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>	2025-06-30 06:05:23 +00:00
Samuli Piippo	6dcfaaa359	Update recipes to match S/UNPACKDIR changes in oe-core/whinlatter In whinlatter, git sources are placed by default to UNPACKDIR/BP and default value for S now works for git projects. Remove settings of S and use BB_GIT_DEFAULT_DESTSUFFIX in recipes with multiple git repos. To support previous Yocto versions, set default value for BB_GIT_DEFAULT_DESTSUFFIX that matches the default S and use it for all git checkouts. Pick-to: 6.9 6.8 Change-Id: I49d7ab7e2d34695618a48bf5f649341a8de2cbda Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit `8553e4019a`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-06-30 06:05:05 +00:00
Samuli Piippo	cd5e41c6c5	Update qt module branch Use correct branch for Qt 6.10 Change-Id: I2cda29899291e2f0f053644defe63840c68861d7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2025-06-11 12:03:47 +00:00
Samuli Piippo	2ef3f67de3	qtwebchannel: skip buildpath QA for examples Example contains path to builddir. Pick-to: dev 6.9 Change-Id: I8e5158c1ac214485be9017c8c83636f7003d6239 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2025-06-11 04:48:41 +00:00
Samuli Piippo	a9be703b3b	qtbase: fix build Add temporary patches to fix latest submodule update. Change-Id: Id876a8bb95434ec1c7dff664eeb60719e63b17e7 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>	2025-06-11 04:48:36 +00:00
Samuli Piippo	2eabd2719a	Revert "qtbase: Add pending patch for waylandscanner" This reverts commit `3ff0e0a717`. Patch was merged to qtbase. Pick-to: dev Change-Id: I2af319d8268be07b5ffa082618b5df70ac46781f Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>	2025-06-11 04:48:32 +00:00
Qt Submodule Update Bot	9bc00daf46	Update submodule refs on '6.10' in yocto/meta-qt6 Change-Id: Iaccbe5c271937a6b217134944ab2b1499c775b00 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-06-11 04:48:29 +00:00
Mikko Gronoff	3ff0e0a717	qtbase: Add pending patch for waylandscanner Add pending upstream submitted patch to fix CI build of latest submodule update & adaptation of wayland client to qtbase. Change-Id: I36e7f1068ebae91b3df6f05e6be948b1b772137f Reviewed-by: Ari Parkkila <ari.parkkila@qt.io> (cherry picked from commit `01bd041018`)	2025-06-02 12:27:39 +03:00
Samuli Piippo	6f63824653	Adapt to QtWayland client move to QtBase QtWayland client and tools were moved to qtbase. Add new PACKAGECONFIG for qtwaylandscanner and enable it on native(sdk) builds. Remove the now obsolete native(sdk) qtwayland builds and dependencies to it. Change-Id: I2dc351d5b81d586bb768a0b09953eaa213fd556c Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit `313ce6e26f`) Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>	2025-06-02 12:27:28 +03:00
Samuli Piippo	b10f13b07d	qtgrpc: remove unneeded patch Original issue has been fixed in upstream. Change-Id: I22c4daf0f62d1c162ace01976adf70b03494e786 Reviewed-by: Ari Parkkila <ari.parkkila@qt.io> (cherry picked from commit `8fbde08307`)	2025-06-02 12:27:19 +03:00
Samuli Piippo	9387e3b78a	ptest: use the prefix path QT_ADDITIONAL_PACKAGES_PREFIX_PATH can use the prefix path instead of the cmake path when configuring the path to the installed module. Change it so that qmltestrunner can be found correctly after qtbase change Icfe972a7ab1d0c99518383eab1c885e490cdb4d6. Change-Id: I777ae8f05d8b666ea18f67db8ed7f47db9218799 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `35f53aa1a6`) Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>	2025-06-02 12:27:10 +03:00
Qt Submodule Update Bot	7ed5be93ec	Update submodule refs on 'dev' in yocto/meta-qt6 Change-Id: I00f6f20aecec3a7bdf9d887efe7e6e36ff55c8d4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> (cherry picked from commit `261403fd46`) Reviewed-by: Ari Parkkila <ari.parkkila@qt.io>	2025-06-02 12:27:03 +03:00