Verify QT_VERSION

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

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

README.md

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

classes/qt6-qmake.bbclass

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

classes/verify-qt-version.bbclass

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

coin/module_config.yaml

@@ -7,7 +7,7 @@ accept_configuration:
       equals_value: Yocto
     - condition: property
       property: target.arch
-      in_values: [TARGET1, TARGET2, TARGET3, TARGET4, TARGET5]
+      in_values: [TARGET1, TARGET2, TARGET3, TARGET4, TARGET5, TARGET6, TARGET7]
 
 machine_type:
   Build:
@@ -15,13 +15,15 @@ machine_type:
 
 # Target build matrix:
 #
-#           [target1]       [target2]   [target3]       [target4]       [target5]
-# [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] [target2]  [target3] [target4]  [target5] [target6] [target7]
+# [machine]   qemuarm64 qemux86-64 qemuarm   qemux86    qemuarm64 qemuarm64 qemuarm64
+# [yocto]     master    walnascar  scarthgap whinlatter scarthgap master    master
+# [wayland]   yes       no         yes       yes        yes       no        yes
+# [x11]       no        yes        yes       no         no        yes       yes
+# [opengl]    yes       yes        yes       yes        yes       no        yes
+# [mingw]     no        no         yes       no         no        no        no
+# [static]    no        no         no        no         yes       no        no
+# [toolchain] gcc       gcc        gcc       gcc        gcc       gcc       clang
 
 target1: &target1
   type: Group
@@ -34,7 +36,10 @@ target1: &target1
       variableValue: master.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs wayland
+      variableValue: ci configs wayland opengl
+    - type: EnvironmentVariable
+      variableName: CHECK_COMPATIBILITY
+      variableValue: 1
   enable_if:
       condition: property
       property: target.arch
@@ -50,7 +55,7 @@ target2: &target2
       variableValue: walnascar.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs
+      variableValue: ci configs x11 opengl
   enable_if:
       condition: property
       property: target.arch
@@ -66,7 +71,7 @@ target3: &target3
       variableValue: scarthgap.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs mingw
+      variableValue: ci configs mingw wayland x11 opengl
   enable_if:
       condition: property
       property: target.arch
@@ -79,10 +84,10 @@ target4: &target4
       variableValue: qemux86
     - type: EnvironmentVariable
       variableName: MANIFEST
-      variableValue: styhead.xml
+      variableValue: whinlatter.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs wayland no-webengine
+      variableValue: ci configs wayland opengl
   enable_if:
       condition: property
       property: target.arch
@@ -95,14 +100,46 @@ target5: &target5
       variableValue: qemuarm64
     - type: EnvironmentVariable
       variableName: MANIFEST
-      variableValue: kirkstone.xml
+      variableValue: scarthgap.xml
     - type: EnvironmentVariable
       variableName: TEST_CONFIGS
-      variableValue: ci configs wayland static no-webengine
+      variableValue: ci configs wayland opengl static
   enable_if:
       condition: property
       property: target.arch
       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:
@@ -111,6 +148,8 @@ instructions:
   - *target3
   - *target4
   - *target5
+  - *target6
+  - *target7
   - type: EnvironmentVariable
     variableName: DL_DIR
     variableValue: "/mnt/yocto-cache/downloads"
@@ -144,7 +183,20 @@ instructions:
           --reference /mnt/yocto-cache/mirror
       ./repo sync
 
-      source ./poky/oe-init-build-env
+      source ./openembedded-core/oe-init-build-env
+
+      # check compatibility agaist current Yocto master
+      if [ -n "${CHECK_COMPATIBILITY}" ]; then
+        yocto-check-layer ${SOURCE_DIR} \
+          --dependency \
+            ../meta-openembedded/meta-oe \
+            ../meta-openembedded/meta-python \
+          --additional-layer \
+            ../meta-mingw \
+          --no-auto-dependency
+      fi
+
+      bitbake-layers add-layer ../meta-yocto/meta-poky
       bitbake-layers add-layer ../meta-openembedded/meta-oe
       bitbake-layers add-layer ../meta-openembedded/meta-python
       bitbake-layers add-layer ../meta-openembedded/meta-multimedia
@@ -156,7 +208,10 @@ instructions:
       done
 
       # build toolchain which should include all supported recipes
-      bitbake meta-toolchain-qt6 nativesdk-packagegroup-qt6-toolchain-host packagegroup-qt6-modules
+      bitbake meta-toolchain-qt6 \
+          nativesdk-packagegroup-qt6-toolchain-host \
+          packagegroup-qt6-modules \
+          packagegroup-qt6-examples
     filename: "{{.BuildDir}}/start-build"
     fileMode: 420
   - type: ExecuteCommand

coin/test-clang.inc

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

coin/test-configs.inc

@@ -1,3 +1,4 @@
+DISTRO = "poky"
 # use systemd
 INIT_MANAGER:forcevariable = "systemd"
 
@@ -40,63 +41,16 @@ 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 kms gbm zstd libproxy gssapi vulkan mtdev cups \
+    tslib libproxy gssapi mtdev cups ctf \
     sql-mysql sql-odbc sql-psql sql-sqlite journald brotli \
     ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
 "
 
-# imageformats mng FIXME
-PACKAGECONFIG:append:pn-qtimageformats = " jasper"
+RDEPENDS:${PN}:append:pn-packagegroup-qt6-modules = " packagegroup-qt6-examples"
 
-# enable examples for all Qt modules
-PACKAGECONFIG:append:pn-qmlcompilerplus = " examples"
-PACKAGECONFIG:append:pn-qt3d = " examples"
-PACKAGECONFIG:append:pn-qt5compat = " examples"
-PACKAGECONFIG:append:pn-qtapplicationmanager = " examples"
-PACKAGECONFIG:append:pn-qtbase = " examples"
-PACKAGECONFIG:append:pn-qtcharts = " examples"
-PACKAGECONFIG:append:pn-qtcoap = " examples"
-PACKAGECONFIG:append:pn-qtconnectivity = " examples"
-PACKAGECONFIG:append:pn-qtdatavis3d = " examples"
-PACKAGECONFIG:append:pn-qtdeclarative = " examples"
-PACKAGECONFIG:append:pn-qtdeviceutilities = " examples"
-PACKAGECONFIG:append:pn-qtgraphs = " examples"
-PACKAGECONFIG:append:pn-qtgrpc = " examples"
-PACKAGECONFIG:append:pn-qthttpserver = " examples"
-PACKAGECONFIG:append:pn-qtimageformats = " examples"
-PACKAGECONFIG:append:pn-qtinsighttracker = " examples"
-PACKAGECONFIG:append:pn-qtinterfaceframework = " examples"
-PACKAGECONFIG:append:pn-qtlanguageserver = " examples"
-PACKAGECONFIG:append:pn-qtlocation = " examples"
-PACKAGECONFIG:append:pn-qtlottie = " examples"
-PACKAGECONFIG:append:pn-qtmqtt = " examples"
-PACKAGECONFIG:append:pn-qtmultimedia = " examples"
-PACKAGECONFIG:append:pn-qtnetworkauth = " examples"
-PACKAGECONFIG:append:pn-qtopcua = " examples"
-PACKAGECONFIG:append:pn-qtpdf = " examples"
-PACKAGECONFIG:append:pn-qtpositioning = " examples"
-PACKAGECONFIG:append:pn-qtquick3d = " examples"
-PACKAGECONFIG:append:pn-qtquick3dphysics = " examples"
-PACKAGECONFIG:append:pn-qtquickdesigner-components = " examples"
-PACKAGECONFIG:append:pn-qtquicktimeline = " examples"
-PACKAGECONFIG:append:pn-qtremoteobjects = " examples"
-PACKAGECONFIG:append:pn-qtscxml = " examples"
-PACKAGECONFIG:append:pn-qtsensors = " examples"
-PACKAGECONFIG:append:pn-qtserialbus = " examples"
-PACKAGECONFIG:append:pn-qtserialport = " examples"
-PACKAGECONFIG:append:pn-qtshadertools = " examples"
-PACKAGECONFIG:append:pn-qtspeech = " examples"
-PACKAGECONFIG:append:pn-qtsvg = " examples"
-PACKAGECONFIG:append:pn-qttools = " examples"
-PACKAGECONFIG:append:pn-qttranslations = " examples"
-PACKAGECONFIG:append:pn-qtvirtualkeyboard = " examples"
-PACKAGECONFIG:append:pn-qtvncserver = " examples"
-PACKAGECONFIG:append:pn-qtwayland = " examples"
-PACKAGECONFIG:append:pn-qtwebchannel = " examples"
-PACKAGECONFIG:append:pn-qtwebengine = " examples"
-PACKAGECONFIG:append:pn-qtwebsockets = " examples"
-PACKAGECONFIG:append:pn-qtwebview = " examples"
+# remove all main features, added back in different builds
+POKY_DEFAULT_DISTRO_FEATURES:remove = "opengl wayland vulkan"
+DISTRO_FEATURES_DEFAULT:remove = "x11"

coin/test-no-webengine.inc

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

coin/test-opengl.inc

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

coin/test-static.inc

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

coin/test-wayland.inc

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

coin/test-x11.inc

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

conf/layer.conf

@@ -35,12 +35,10 @@ LAYERVERSION_qt6-layer = "1"
 
 LAYERDEPENDS_qt6-layer = "core openembedded-layer meta-python"
 
-LAYERSERIES_COMPAT_qt6-layer = "kirkstone langdale mickledore nanbield scarthgap styhead walnascar"
+LAYERSERIES_COMPAT_qt6-layer = "scarthgap styhead walnascar whinlatter"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
-IMAGE_FEATURES[validitems] += "qtcreator-debug"
-
 # Set a variable to get to the top of the metadata location
 QT6BASE := "${LAYERDIR}"
 
@@ -48,12 +46,9 @@ QT_GIT_PROJECT ?= "qt"
 QT_GIT ?= "git://code.qt.io"
 QT_GIT_PROTOCOL ?= "git"
 QT_EDITION ?= "opensource"
-QT_VERSION = "6.10.0"
+QT_VERSION = "6.11.0"
 
 QT_COMMERCIAL_GIT ?= "git://codereview.qt-project.org"
 QT_COMMERCIAL_GIT_PROTOCOL ?= "ssh"
 
 QT_COMMERCIAL_MODULES ?= "0"
-
-# License mapping back to old license files
-SPDXLICENSEMAP[GFDL-1.3-no-invariants-only] = "GFDL-1.3"

recipes-core/minizip/minizip_1.2.11.bb

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

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

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

recipes-multimedia/webp/libwebp_%.bbappend

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

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

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

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

@@ -11,6 +11,7 @@ RDEPENDS:${PN} += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d', '', d)} \
     qt5compat \
     qtapplicationmanager \
+    qtcanvaspainter \
     qtcharts \
     qtcoap \
     qtconnectivity \
@@ -41,6 +42,7 @@ RDEPENDS:${PN} += " \
     qtshadertools \
     qtspeech \
     qtsvg \
+    qttasktree \
     qttranslations \
     qtvirtualkeyboard \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
@@ -72,3 +74,5 @@ 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"

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

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

recipes-qt/qt6/chromium-gn.inc

@@ -4,6 +4,7 @@ inherit linuxloader
 inherit qemu
 
 COMPATIBLE_MACHINE = "(-)"
+COMPATIBLE_MACHINE:libc-musl = "(-)"
 COMPATIBLE_MACHINE:aarch64 = "(.*)"
 COMPATIBLE_MACHINE:armv6 = "(.*)"
 COMPATIBLE_MACHINE:armv7a = "(.*)"

recipes-qt/qt6/qt3d-examples_git.bb

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

recipes-qt/qt6/qt3d_git.bb

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

recipes-qt/qt6/qt5compat-examples_git.bb

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

recipes-qt/qt6/qt6-commercial.inc

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

recipes-qt/qt6/qt6-examples.inc

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

recipes-qt/qt6/qt6-git.inc

@@ -6,67 +6,70 @@ inherit srcrev-update
 QT_MODULE ?= "${BPN}"
 QT_MODULE_BRANCH ?= "dev"
 QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
-QT_MODULE_REPO ?= "${QT_MODULE}.git"
+QT_MODULE_REPO ?= "${QT_MODULE}"
 
-SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}"
+# for compatibility with Yocto releases before whinlatter
+BB_GIT_DEFAULT_DESTSUFFIX ?= "${BP}"
+
+SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}"
 
 CVE_PRODUCT ?= "qt:${BPN} qt:qt"
 
-S = "${WORKDIR}/git"
-
 PV = "${QT_VERSION}"
 
-SRCREV = "${SRCREV_${QT_MODULE}}"
+SRCREV = "${SRCREV_${QT_MODULE_REPO}}"
 
-SRCREV_tqtc-qmlcompilerplus = "62f0cc04dc7d1da3707632fd240b0fca2aa33426"
-SRCREV_tqtc-qtinsighttracker = "64ac6017bc4e31f61d07501039cec0aaf6a17087"
-SRCREV_tqtc-qtvncserver = "b14bc481037187956fabf3ffe6a3aede5abc330b"
-SRCREV_qt3d = "315ed3c0904612743a7c5ee547800865ffd5e20b"
-SRCREV_qt3d-assimp = "647f94648c0ae24b9c6684383a9dbbc0e2fc23b7"
-SRCREV_qt5compat = "bd407c33e78d47eb2ffc2547f300e2ed9d4d997c"
-SRCREV_qtbase = "ccce91461a39adebde7ec7803b4cc0b97093f77f"
-SRCREV_qtapplicationmanager = "7144c68027dc113f389d73570bcdaeccaae7affd"
-SRCREV_qtcharts = "de85db072bd47f780d63d25b0113a03a10ec5ee1"
-SRCREV_qtcoap = "ce19f0a28ecb755267f601015d2a14b10cdace6f"
-SRCREV_qtconnectivity = "fa25e5809b9a55d2d2014753f1d2c5c3246b05ba"
-SRCREV_qtdatavis3d = "de145800f9a56d4bd1249eb6c4780d7b203c507c"
-SRCREV_qtdeclarative = "30d2b91fb48c2a28188f75d3e87311a2a6aba5d8"
-SRCREV_qtdeviceutilities = "8c689f05318a6d7b4bef80cdaf6038745d2357c6"
-SRCREV_qtdoc = "fa58cd1ab825316de312958d93cf4ce6d4558cf0"
-SRCREV_qtgraphs = "155b4547efea597777cc89ee353938237b7f036d"
-SRCREV_qtgrpc = "abbe99c0d05df122346f2f2452efa10bf840a90b"
-SRCREV_qthttpserver = "bd29a7f0f57c6738826419e88ce46faafd04f4dd"
-SRCREV_qtimageformats = "fa96798b387a6adbe4838eec05165645ccd8853d"
-SRCREV_qtinterfaceframework = "73efcbaf70e368c429278cc9fcc22326f9ca3269"
-SRCREV_qtlanguageserver = "b5d17027959532cbb0a78a9ebb1af1c566d451d9"
-SRCREV_qtlocation = "7a9598796d183acb0960a242fbae0231ced7055f"
-SRCREV_qtlottie = "d2436dcfe2dc8850775a92ac2cec76f57d3bc2d9"
-SRCREV_qtmqtt = "9c04ffb5c3fee0f30cee7ee7f691fba906615538"
-SRCREV_qtmultimedia = "e94cfbef6b1d9242ae8bc6ec860da7fd6dfe3834"
-SRCREV_qtnetworkauth = "e6c4d573e3adda8ea62dbdbc043f5c80ca96ebef"
-SRCREV_qtopcua = "061d7877406ae4420fba6aa6051b63043c3f0d7c"
-SRCREV_qtpositioning = "be4569c6e56969242c10ef2aefd035c7802b53a4"
-SRCREV_qtquick3d = "6476f23e274c3c3d8b41c9c7b73f50e254129c77"
-SRCREV_qtquick3d-assimp = "647f94648c0ae24b9c6684383a9dbbc0e2fc23b7"
-SRCREV_qtquick3dphysics = "0b3ffcc685f81f3d1714560a51e649e7fdeea58a"
+SRCREV_tqtc-qmlcompilerplus = "2f2395a50b0ddb1af6b699a90cfbe2164f67b6e7"
+SRCREV_tqtc-qtinsighttracker = "ac8972a670cf492ce2d2cf4ab757c43c5291804f"
+SRCREV_tqtc-qtvncserver = "8bfcb2ede4e5021a637933ec927ce2678fdc7f0c"
+SRCREV_qt3d = "1cac4a649679618f1301aba0074dae063eac6b98"
+SRCREV_qt3d-assimp = "488a2f7af2920295ada886f113a0d563dab79b8d"
+SRCREV_qt5compat = "287be0a7793621dd4e6e780595bf20aa3ae2b2c4"
+SRCREV_qtbase = "bd04c5d7a4b907b8c4a2d2dda4ba3f24f687fb7f"
+SRCREV_qtapplicationmanager = "4bd1f1fba3f803a7284a5110e117e8d162d54065"
+SRCREV_qtcanvaspainter = "689445d357df249cdf0d5ec0437bd6b8b68368c8"
+SRCREV_qtcharts = "46a2c96f3e376bc2de0e0710ec0e143c1a784081"
+SRCREV_qtcoap = "fbd3db03f13a7d1fd79aaa2392e331a1737f7f68"
+SRCREV_qtconnectivity = "e2bee5bf54cb0ac721fd9da0884a8f5a251e63fa"
+SRCREV_qtdatavis3d = "ca8d79677e63c3111536f9b03c4184f732810498"
+SRCREV_qtdeclarative = "59da4b17158303fc671869547bcb91b675bf4702"
+SRCREV_qtdeviceutilities = "4f86edb2eb255397f849528f43f49a59d4973109"
+SRCREV_qtdoc = "42cd131492d531dc32660f79e81c6f85dbc56a12"
+SRCREV_qtgraphs = "c08c320fc36fa31b264ac3c8f0f62aa94ac41b30"
+SRCREV_qtgrpc = "2bccf14f841bca476a6f90242b30368742de4a66"
+SRCREV_qthttpserver = "648e8b021ee219c7034c357cd9a5424a3040dfad"
+SRCREV_qtimageformats = "cb96a5aa2e37e0a6d31df138d24c207c6951de3a"
+SRCREV_qtinterfaceframework = "1dfaeb1d7c2cb60b56d4c9e1ff6e622e03d86d97"
+SRCREV_qtlanguageserver = "8599dad24858f93876012bd2071d096a31dfda0a"
+SRCREV_qtlocation = "8d13de6bc6a2207eca4eded65741a28d95d433a3"
+SRCREV_qtlottie = "3a5ce6df4ba97e29e7d7dc16c2bb3e849885d8fb"
+SRCREV_qtmqtt = "4f6e8dd0f1c78926394335686cfa8537303b1a07"
+SRCREV_qtmultimedia = "074d188889891972cb456817510f62b158e9ca67"
+SRCREV_qtnetworkauth = "0b8d323ae151f3826d7b5a223d80e5293cd1ed06"
+SRCREV_qtopcua = "f4dd8c4011d4ba3d11fbaaede379de247fe09690"
+SRCREV_qtpositioning = "56ede83df68dcb1048564aa463f8b48985f5f99e"
+SRCREV_qtquick3d = "3468786a6e3320eca9d4cc6d5444636ba5d88c73"
+SRCREV_qtquick3d-assimp = "488a2f7af2920295ada886f113a0d563dab79b8d"
+SRCREV_qtquick3dphysics = "9c860d931ef38751a1bc03ef813610dbd7793469"
 SRCREV_qtquickdesigner-components = "8c9e0faa0dd8b8adf019e357212e59898a7bebfb"
-SRCREV_qtquicktimeline = "4aaad7c9320b6e2688fe7dd42ce179e90ba1cceb"
-SRCREV_qtremoteobjects = "9347765c55982794709db65c0f418b00acd5a500"
-SRCREV_qtscxml = "a24a44bf6fef3ef264840124cde82cbc1e567871"
-SRCREV_qtsensors = "c2bb52c3b1972e6fb2f8d2485a5a119fdffe03ad"
-SRCREV_qtserialbus = "efdbba55eb147e934b341df22e2bb78b3bb26095"
-SRCREV_qtserialport = "b26323144248ff40edd271c9c043baa25475d644"
-SRCREV_qtshadertools = "0c841bbdbfd00edfecfd5c3d8294ee3b2aef9f83"
-SRCREV_qtspeech = "08cddcb717d2d9a9780ebc4e2ea11f088ac175a6"
-SRCREV_qtsvg = "45d219f1f83b3a832d4f2829821144ea74a852f7"
-SRCREV_qttools = "059e2e42c8625aa9c5767627ebcbc0956d89ec01"
-SRCREV_qttools-qlitehtml = "2992a310640697325791a5494ca8f4d4552de368"
+SRCREV_qtquicktimeline = "831a9978aee0e963b88f5cb122228ecb7b99b13d"
+SRCREV_qtremoteobjects = "6c1fe0e164815b540b996d3246634b5e43d3ccb9"
+SRCREV_qtscxml = "604aa8558028411a9b9ac3c4bd813231db2264d0"
+SRCREV_qtsensors = "8d6d925ae615a23c8b84b51ad3701dce78afc53c"
+SRCREV_qtserialbus = "c5d1600f1270a8e4953d1c074b9faed7d99fdd2d"
+SRCREV_qtserialport = "cc95fa549119370ef78587af749e8f17544c95cc"
+SRCREV_qtshadertools = "45ef193c92f93c7a0bf8de53163a9ca8886f8267"
+SRCREV_qtspeech = "63e490d12db7790b29fa61f0c6e0677cef7074e9"
+SRCREV_qtsvg = "7c65619dc929ebf52b63251e8601b47f2f2ee207"
+SRCREV_qttasktree = "93e1d91ac78e232c3ca6b1db0031a30d08b334dd"
+SRCREV_qttools = "369f8a1fa6ac7527227df7a99399b0428a16ba97"
+SRCREV_qttools-qlitehtml = "3fe5821dad98747d6e41c9ed54b86c3d0eee9daf"
 SRCREV_qttools-qlitehtml-litehtml = "6ca1ab0419e770e6d35a1ef690238773a1dafcee"
-SRCREV_qttranslations = "727eda4e2f24c257b91ddb8dca1820db4150992b"
-SRCREV_qtvirtualkeyboard = "e8238f568ef7e541fce492117da8876b2b34bf42"
-SRCREV_qtwayland = "85c978dd9acfa07ed7d83b90b92a9767ab81d775"
-SRCREV_qtwebchannel = "bed96d1977bb7da20a527b52b0e5c80be65e796f"
-SRCREV_qtwebengine = "7cbc1bc4b9ab2e09880633888eacbc146e16701a"
-SRCREV_qtwebengine-chromium = "45d204bccd41e0f9ec166e47e2a15714e26f384b"
-SRCREV_qtwebsockets = "7ac0388c474dae2aae4998d762feafc63fc4411d"
-SRCREV_qtwebview = "3b7ea7f2581c5fedfa44b7cc640ed37a5fd7e6cc"
+SRCREV_qttranslations = "0a794041faf3e647ff9623d99754a8cfdaa68a47"
+SRCREV_qtvirtualkeyboard = "e9d1ea1624cf2c961ba4aa077090367d108b130a"
+SRCREV_qtwayland = "586e489ce426e833729c333499cb98a06fbae1b0"
+SRCREV_qtwebchannel = "227750ae26054f88c202c370930c1dccf529b7fc"
+SRCREV_qtwebengine = "152b67fa5b7862d2a63fd0574ebeb4759335b935"
+SRCREV_qtwebengine-chromium = "031a10673ee369c84b2db2669fc147adf175a3be"
+SRCREV_qtwebsockets = "f269b863b994977ae8f937620c99c60e811fcbf9"
+SRCREV_qtwebview = "374f9d6ebc7226b68b4e336a136e99e73fd42b44"

recipes-qt/qt6/qt6-ptest.inc

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

recipes-qt/qt6/qt6.inc

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

recipes-qt/qt6/qtapplicationmanager-examples_git.bb

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

recipes-qt/qt6/qtapplicationmanager_git.bb

@@ -14,16 +14,16 @@ 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', '', d)}"
+PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'multi-process bubblewrap', '', d)}"
 
 PACKAGECONFIG[tools-only] = "-DFEATURE_am_tools_only=ON, -DFEATURE_am_tools_only=OFF"
-PACKAGECONFIG[multi-process] = "-DFEATURE_am_multi_process=ON, -DFEATURE_am_multi_process=OFF, qtwayland qtwayland-native"
+PACKAGECONFIG[multi-process] = "-DFEATURE_am_multi_process=ON,-DFEATURE_am_multi_process=OFF,qtwayland"
+PACKAGECONFIG[bubblewrap] = "-DFEATURE_am_bubblewrap_container=ON,-DFEATURE_am_bubblewrap_container=OFF,,bubblewrap"
 
 PACKAGECONFIG:class-native ??= "tools-only"
 PACKAGECONFIG:class-nativesdk ??= "${PACKAGECONFIG:class-native}"

recipes-qt/qt6/qtbase-examples_git.bb

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

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

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

recipes-qt/qt6/qtbase_git.bb

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

recipes-qt/qt6/qtcanvaspainter-examples_git.bb

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

recipes-qt/qt6/qtcanvaspainter_git.bb

@@ -0,0 +1,25 @@
+LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GFDL-1.3-no-invariants-only & BSD-3-Clause) & Zlib"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
+    file://LICENSES/Zlib.txt;md5=370cf821bfe014e4427629dab445adcf \
+"
+
+inherit qt6-cmake
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6.inc
+
+DEPENDS = "\
+    qtbase \
+    qtcanvaspainter-native \
+    qtdeclarative \
+    qtdeclarative-native \
+    qtshadertools \
+    qtshadertools-native \
+"
+
+BBCLASSEXTEND = "native nativesdk"

recipes-qt/qt6/qtcharts-examples_git.bb

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

recipes-qt/qt6/qtcoap-examples_git.bb

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

recipes-qt/qt6/qtcoap_git.bb

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

recipes-qt/qt6/qtconnectivity-examples_git.bb

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

recipes-qt/qt6/qtconnectivity_git.bb

@@ -18,6 +18,5 @@ 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 = ""

recipes-qt/qt6/qtdatavis3d-examples_git.bb

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

recipes-qt/qt6/qtdeclarative-examples_git.bb

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

recipes-qt/qt6/qtdeviceutilities-examples_git.bb

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

recipes-qt/qt6/qtdeviceutilities_git.bb

@@ -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 qtvirtualkeyboard"
+DEPENDS = "qtbase qtdeclarative qtdeclarative-native"
 RDEPENDS:${PN} = "connman"
 

recipes-qt/qt6/qtdoc-examples_git.bb

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

recipes-qt/qt6/qtdoc_git.bb

@@ -1,12 +1,10 @@
-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"
+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/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/ISC.txt;md5=2494cdbaca137fd93842fe9702e9bc4d \
+    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
     file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=caa060942f6b722bc4329d4195584c38 \
 "
 
@@ -15,30 +13,11 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-DEPENDS += "\
+DEPENDS = "\
     qtbase \
-    qtcharts \
-    qtdeclarative qtdeclarative-native \
-    qtgraphs \
-    qtlocation \
-    qtmultimedia \
-    qtpositioning \
-    qtquick3d qtquick3d-native \
-    qtsensors \
-    qtshadertools-native \
-    qtsvg \
-    qttools \
-    qttools-native \
-    qtwebsockets \
+    qtdeclarative \
+    qtdeclarative-native \
+    qttasktree \
 "
-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"

recipes-qt/qt6/qtgraphs-examples_git.bb

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

recipes-qt/qt6/qtgrpc-examples_git.bb

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

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

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

recipes-qt/qt6/qtgrpc_git.bb

@@ -13,16 +13,11 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-SRC_URI += "file://0001-Remove-the-export-of-QT_PROTO_INCLUDES-property.patch"
-
 DEPENDS += "qtbase qtgrpc-native protobuf protobuf-native"
 
 PACKAGECONFIG ?= "qml"
 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"

recipes-qt/qt6/qthttpserver-examples_git.bb

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

recipes-qt/qt6/qtimageformats_git.bb

@@ -14,7 +14,7 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-PACKAGECONFIG ?= "tiff webp"
+PACKAGECONFIG ?= "jasper mng tiff webp"
 PACKAGECONFIG[jasper] = "-DFEATURE_jasper=ON,-DFEATURE_jasper=OFF,jasper"
 PACKAGECONFIG[mng] = "-DFEATURE_mng=ON,-DFEATURE_mng=OFF,libmng"
 PACKAGECONFIG[tiff] = "-DFEATURE_tiff=ON,-DFEATURE_libtiff=OFF,tiff"

recipes-qt/qt6/qtinsighttracker-examples_git.bb

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

recipes-qt/qt6/qtinterfaceframework-examples_git.bb

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

recipes-qt/qt6/qtinterfaceframework_git.bb

@@ -28,5 +28,3 @@ 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"

recipes-qt/qt6/qtlanguageserver_git.bb

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

recipes-qt/qt6/qtlocation-examples_git.bb

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

recipes-qt/qt6/qtlottie_git.bb

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

recipes-qt/qt6/qtmqtt-examples_git.bb

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

recipes-qt/qt6/qtmqtt_git.bb

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

recipes-qt/qt6/qtmultimedia-examples_git.bb

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

recipes-qt/qt6/qtmultimedia_git.bb

@@ -25,7 +25,6 @@ PACKAGECONFIG ?= "\
     gstreamer pulseaudio qml spatialaudio spatialaudio_quick3d"
 
 PACKAGECONFIG[alsa] = "-DFEATURE_alsa=ON,-DFEATURE_alsa=OFF,alsa-lib"
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtsvg"
 PACKAGECONFIG[ffmpeg] = "-DFEATURE_ffmpeg=ON,-DFEATURE_ffmpeg=OFF,ffmpeg"
 PACKAGECONFIG[gstreamer] = "-DFEATURE_gstreamer=ON,-DFEATURE_gstreamer=OFF,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
 PACKAGECONFIG[pulseaudio] = "-DFEATURE_pulseaudio=ON,-DFEATURE_pulseaudio=OFF,pulseaudio"

recipes-qt/qt6/qtnetworkauth-examples_git.bb

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

recipes-qt/qt6/qtopcua-examples_git.bb

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

recipes-qt/qt6/qtpdf-examples_git.bb

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

recipes-qt/qt6/qtpdf_git.bb

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

recipes-qt/qt6/qtpositioning-examples_git.bb

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

recipes-qt/qt6/qtpositioning_git.bb

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

recipes-qt/qt6/qtquick3d-examples_git.bb

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

recipes-qt/qt6/qtquick3d_git.bb

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

recipes-qt/qt6/qtquick3dphysics-examples_git.bb

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

recipes-qt/qt6/qtremoteobjects-examples_git.bb

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

recipes-qt/qt6/qtscxml-examples_git.bb

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

recipes-qt/qt6/qtsensors-examples_git.bb

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

recipes-qt/qt6/qtserialbus-examples_git.bb

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

recipes-qt/qt6/qtserialport-examples_git.bb

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

recipes-qt/qt6/qtspeech-examples_git.bb

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

recipes-qt/qt6/qtspeech_git.bb

@@ -15,6 +15,9 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtmultimedia"
 
-PACKAGECONFIG ?= "qml"
+PACKAGECONFIG ?= "\
+    qml \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'multimedia-layer', 'flite', '', d)} \
+"
 PACKAGECONFIG[flite] = "-DFEATURE_flite=ON,-DFEATURE_flite=OFF,flite"
 PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"

recipes-qt/qt6/qttasktree-examples_git.bb

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

recipes-qt/qt6/qttasktree_git.bb

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

recipes-qt/qt6/qttools-examples_git.bb

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

recipes-qt/qt6/qttools_git.bb

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

recipes-qt/qt6/qtvirtualkeyboard-examples_git.bb

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

recipes-qt/qt6/qtvirtualkeyboard_git.bb

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

recipes-qt/qt6/qtvncserver-examples_git.bb

@@ -0,0 +1,19 @@
+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)} \
+"

recipes-qt/qt6/qtvncserver_git.bb

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

recipes-qt/qt6/qtwayland-examples_git.bb

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

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

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

recipes-qt/qt6/qtwayland_git.bb

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

recipes-qt/qt6/qtwebchannel-examples_git.bb

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

recipes-qt/qt6/qtwebchannel_git.bb

@@ -16,6 +16,10 @@ 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"

recipes-qt/qt6/qtwebengine-examples_git.bb

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

recipes-qt/qt6/qtwebengine.inc

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

recipes-qt/qt6/qtwebengine/0002-Enable-examples.patch

@@ -1,26 +0,0 @@
-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()

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

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

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

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

recipes-qt/qt6/qtwebengine_git.bb

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

recipes-qt/qt6/qtwebsockets-examples_git.bb

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

recipes-qt/qt6/qtwebview-examples_git.bb

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