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

@@ -3,37 +3,87 @@ Qt6 OpenEmbedded/Yocto Project layer
 
 This layer depends on:
 
-URI: https://github.com/openembedded/openembedded-core
+URI: https://git.openembedded.org/openembedded-core/
 
-and optionally:
-
-URI: https://github.com/openembedded/meta-openembedded
+URI: https://git.openembedded.org/meta-openembedded/
 
 Yocto version support
 ---------------------
 
-The branching of meta-qt6 layer follows Qt branching scheme, that is
-`dev` for the development branch, and `6.x` for each minor release.
+The branching of meta-qt6 layer follows [Qt branching scheme](https://wiki.qt.io/Branch_Guidelines),
+that is `dev` for the development branch, `6.x` for minor stabilization branches,
+`6.x.y` for the release branches and `lts-6.x.y` for commercial LTS releases.
 
-Following table shows the Yocto branches which are used to test each
-Qt version.
+Each Qt release is tagged either as `v6.x.y` or `v6.x.y-lts`
 
-| Yocto \ Qt | dev | 6.1 | 6.0 |
-| ---------- |:---:|:---:|:---:|
-| master     |  x  |     |     |
-| hardknott  |  x  |  x  |  x  |
-| gatesgarth |  x  |  x  |  x  |
-| dunfell    |  x  |  x  |  x  |
+Following table shows the Yocto releases which are used to test each
+Qt version (x) and any additional Yocto releases that are stated in
+the LAYERSERIES_COMPAT (c).
+
+| Yocto \ Qt | dev | 6.11 | 6.10 | 6.9  | 6.8 | 6.7 | 6.6 | 6.5 | 6.4 | 6.3 | 6.2 |
+|:---------- |:---:|:----:|:----:|:----:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
+| wrynose    |  x  |  x   |      |      |  x  |     |     |     |     |     |     |
+| whinlatter |  x  |  x   |  x   |  c   |  x  |     |     |     |     |     |     |
+| walnascar  |  x  |  x   |  x   |  c   |  x  |     |     |     |     |     |     |
+| styhead    |  c  |  c   |  c   |  c   |  c  |  c  |     |     |     |     |     |
+| scarthgap  |  x  |  x   |  x   |  c   |  x  |  c  |  c  |  x  |     |     |     |
+| nanbield   |     |      |  c   |  c   |  c  |  c  |  c  |  c  |     |     |     |
+| mickledore |     |      |  c   |  c   |  c  |  c  |  c  |  c  |  c  |     |     |
+| langdale   |     |      |  c   |  c   |  c  |  c  |  c  |  c  |  c  |     |     |
+| kirkstone  |     |      |  x   |  c   |  x  |  c  |  c  |  x  |  c  |  c  |  c  |
+| honister   |     |      |      |      |     |     |  c  |  c  |  c  |  c  |  c  |
+| hardknott  |     |      |      |      |     |     |  c  |  c  |  c  |  c  |  c  |
+| gatesgarth |     |      |      |      |     |     |  c  |  c  |  c  |  c  |  c  |
+| dunfell    |     |      |      |      |     |     |  c  |  x  |  c  |  c  |  c  |
+|            |     |      |      |      |     |     |     |     |     |     |     |
+|            | dev |stable|stable|closed| LTS | EOL | EOL | LTS | EOL | EOL | EOL |
+
+Detailed status of supported Qt versions can be found from
+https://doc.qt.io/qt-6/supported-platforms.html#supported-qt-versions
+
+Commercial Qt
+-------------
+
+Qt is dual-licensed under commercial and open source licenses.
+The license can be selected using the `QT_EDITION` variable. `commercial` and
+`opensource` are valid values. The default value is `opensource`.
+
+For commercial Qt users, the layer provides additional support with LTS
+(Long Term Support) releases for selected Qt versions and additional
+Qt modules licensed as commercial-only.
+
+The LTS releases are available in branches named `lts-6.x`. The source code
+for the LTS releases and the commercial Qt modules are only available for
+commercial Qt license holders. They can only be built and used if you have
+a commercial Qt license and you have set up SSH access to Qt Gerrit (see links below).
+
+The commercial Qt modules are included in the build if the `QT_COMMERCIAL_MODULES`
+variable is set to `1` and you are using a commercial edition of Qt.
+
+QtMultimedia
+------------
+
+Qt Multimedia now prefers [FFmpeg][1] as the multimedia backend instead of GStreamer.
+FFmpeg recipe, however, is flagged with LICENSE_FLAGS = "commercial", which means
+that user must accept the license before FFmpeg can be used in the build. If user
+accepts the license using LICENSE_FLAGS_ACCEPTED = 'commercial_ffmpeg', the FFmpeg
+support is enabled in Qt Multimedia. If user doesn't accept the license,
+Qt Multimedia only uses GStreamer.
+
+[1]: https://doc.qt.io/qt-6/qtmultimedia-index.html#ffmpeg-as-the-default-backend
 
 Contributing
 ------------
 
-To contribute to this layer you should submit the patches for review using
+To contribute to this layer submit the patches for review using
 [Qt Gerrit](https://codereview.qt-project.org).
 
 More information about Qt Gerrit and how to use it:
- - https://wiki.qt.io/Gerrit_Introduction
- - https://wiki.qt.io/Setting_up_Gerrit
+ - [Gerrit_Introduction](https://wiki.qt.io/Gerrit_Introduction)
+ - [Setting_up_Gerrit](https://wiki.qt.io/Setting_up_Gerrit)
+
+Report bugs on [Qt Bug Tracker](https://bugreports.qt.io) using
+`Yocto: meta-qt6 layer` component.
 
 Layer maintainers
 -----------------

SECURITY.md

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

classes/populate_sdk_qt6.bbclass

@@ -0,0 +1,5 @@
+inherit populate_sdk_qt6_base
+
+# include all available modules
+TOOLCHAIN_HOST_TASK:append = " nativesdk-packagegroup-qt6-toolchain-host"
+TOOLCHAIN_TARGET_TASK:append = " packagegroup-qt6-modules"

classes/populate_sdk_qt6_base.bbclass

@@ -1,19 +1,24 @@
 inherit qt6-paths
 
-SDK_POSTPROCESS_COMMAND_prepend = "create_qt6_sdk_files;"
+SDKIMAGE_FEATURES:append = " staticdev-pkgs"
 
+SDK_POSTPROCESS_COMMAND:prepend = "create_qt6_sdk_files;"
 
+EXE_EXT = ""
+EXE_EXT:sdkmingw32 = ".exe"
 PATH_DELIM = ":"
-PATH_DELIM_sdkmingw32 = ";"
+PATH_DELIM:sdkmingw32 = ";"
 
 QT6_INSTALL_HOST_LIBEXECDIR = "${QT6_INSTALL_LIBEXECDIR}"
-QT6_INSTALL_HOST_LIBEXECDIR_sdkmingw32 = "${QT6_INSTALL_LIBEXECDIR_mingw32}"
+QT6_INSTALL_HOST_LIBEXECDIR:sdkmingw32 = "${QT6_INSTALL_LIBEXECDIR:mingw32}"
+
+TARGET_SYSROOT ?= "${SDKTARGETSYSROOT}"
+NATIVE_SYSROOT ?= "${SDKPATHNATIVE}"
 
 create_qt6_sdk_files () {
     # Generate a qt.conf file to be deployed with the SDK
     qtconf=${WORKDIR}/qt.conf
-    touch $qtconf
-    echo '[Paths]' >> $qtconf
+    echo '[Paths]' > $qtconf
     echo 'Prefix = ${prefix}' >> $qtconf
     echo 'Headers = ${QT6_INSTALL_INCLUDEDIR}' >> $qtconf
     echo 'Libraries = ${QT6_INSTALL_LIBDIR}' >> $qtconf
@@ -22,28 +27,29 @@ create_qt6_sdk_files () {
     echo 'Binaries = ${QT6_INSTALL_BINDIR}' >> $qtconf
     echo 'LibraryExecutables = ${QT6_INSTALL_LIBEXECDIR}' >> $qtconf
     echo 'Plugins = ${QT6_INSTALL_PLUGINSDIR}' >> $qtconf
-    echo 'Qml2Imports = ${QT6_INSTALL_QMLDIR}' >> $qtconf
+    echo 'QmlImports = ${QT6_INSTALL_QMLDIR}' >> $qtconf
     echo 'Translations = ${QT6_INSTALL_TRANSLATIONSDIR}' >> $qtconf
     echo 'Documentation = ${QT6_INSTALL_DOCDIR}' >> $qtconf
     echo 'Settings = ${QT6_INSTALL_SYSCONFDIR}' >> $qtconf
     echo 'Examples = ${QT6_INSTALL_EXAMPLESDIR}' >> $qtconf
     echo 'Tests = ${QT6_INSTALL_TESTSDIR}' >> $qtconf
-    echo 'HostPrefix = ${SDKPATHNATIVE}' >> $qtconf
-    echo 'HostData = ${SDKTARGETSYSROOT}${QT6_INSTALL_ARCHDATADIR}' >> $qtconf
-    echo 'HostBinaries = ${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}' >> $qtconf
-    echo 'HostLibraries = ${SDKPATHNATIVE}${QT6_INSTALL_LIBDIR}' >> $qtconf
-    echo 'HostLibraryExecutables = ${SDKPATHNATIVE}${QT6_INSTALL_HOST_LIBEXECDIR}' >> $qtconf
-    echo 'Sysroot = ${SDKTARGETSYSROOT}' >> $qtconf
+    echo 'HostPrefix = ${@os.path.relpath("${NATIVE_SYSROOT}", "${NATIVE_SYSROOT}${QT6_INSTALL_BINDIR}")}' >> $qtconf
+    echo 'HostData = ${@os.path.relpath("${TARGET_SYSROOT}${QT6_INSTALL_ARCHDATADIR}", "${NATIVE_SYSROOT}")}' >> $qtconf
+    echo 'HostBinaries = ${@os.path.relpath("${NATIVE_SYSROOT}${QT6_INSTALL_BINDIR}", "${NATIVE_SYSROOT}")}' >> $qtconf
+    echo 'HostLibraries = ${@os.path.relpath("${NATIVE_SYSROOT}${QT6_INSTALL_LIBDIR}", "${NATIVE_SYSROOT}")}' >> $qtconf
+    echo 'HostLibraryExecutables = ${@os.path.relpath("${NATIVE_SYSROOT}${QT6_INSTALL_HOST_LIBEXECDIR}", "${NATIVE_SYSROOT}")}' >> $qtconf
+    echo 'Sysroot = ${@os.path.relpath("${TARGET_SYSROOT}", "${NATIVE_SYSROOT}${QT6_INSTALL_BINDIR}")}' >> $qtconf
     echo 'HostSpec = linux-oe-g++' >> $qtconf
     echo 'TargetSpec = linux-oe-g++' >> $qtconf
     echo 'SysrootifyPrefix = true' >> $qtconf
 
     # add qt.conf to both bin and libexec dirs
-    cp ${WORKDIR}/qt.conf ${SDK_OUTPUT}${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}/
-    cp ${WORKDIR}/qt.conf ${SDK_OUTPUT}${SDKPATHNATIVE}${QT6_INSTALL_HOST_LIBEXECDIR}/
+    cp ${WORKDIR}/qt.conf ${SDK_OUTPUT}${NATIVE_SYSROOT}${QT6_INSTALL_BINDIR}/
+    cp ${WORKDIR}/qt.conf ${SDK_OUTPUT}${NATIVE_SYSROOT}${QT6_INSTALL_HOST_LIBEXECDIR}/
+    cp ${WORKDIR}/qt.conf ${SDK_OUTPUT}${NATIVE_SYSROOT}${QT6_INSTALL_BINDIR}/target_qt.conf
 
-    install -d ${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d
-    script=${SDK_OUTPUT}${SDKPATHNATIVE}/environment-setup.d/qt6.sh
+    install -d ${SDK_OUTPUT}${NATIVE_SYSROOT}/environment-setup.d
+    script=${SDK_OUTPUT}${NATIVE_SYSROOT}/environment-setup.d/qt6.sh
     touch $script
     echo 'export OE_QMAKE_CFLAGS="$CFLAGS"' >> $script
     echo 'export OE_QMAKE_CXXFLAGS="$CXXFLAGS"' >> $script
@@ -56,62 +62,85 @@ create_qt6_sdk_files () {
     echo 'export OE_QMAKE_OBJCOPY="$OBJCOPY"' >> $script
     echo 'export OE_QMAKE_AR_LTCG="${HOST_PREFIX}gcc-ar"' >> $script
 
-    mkspec=${SDK_OUTPUT}${SDKTARGETSYSROOT}${QT6_INSTALL_MKSPECSDIR}/linux-oe-g++/qmake.conf
-    echo "count(QMAKE_AR, 1): QMAKE_AR = ${AR} cqs" >> $mkspec
-    echo "count(QMAKE_AR_LTCG, 1): QMAKE_AR_LTCG = ${HOST_PREFIX}gcc-ar cqs" >> $mkspec
-    echo "isEmpty(QMAKE_STRIP): QMAKE_STRIP = ${STRIP}" >> $mkspec
-    echo "isEmpty(QMAKE_OBJCOPY): QMAKE_OBJCOPY = ${OBJCOPY}" >> $mkspec
-    echo "isEmpty(QMAKE_CC): QMAKE_CC = ${CC}" >> $mkspec
-    echo "isEmpty(QMAKE_CFLAGS): QMAKE_CFLAGS =  ${CFLAGS}" >> $mkspec
-    echo "isEmpty(QMAKE_CXX): QMAKE_CXX = ${CXX}" >> $mkspec
-    echo "isEmpty(QMAKE_CXXFLAGS): QMAKE_CXXFLAGS =  ${CXXFLAGS}" >> $mkspec
-    echo "isEmpty(QMAKE_LINK): QMAKE_LINK = ${CXX}" >> $mkspec
-    echo "isEmpty(QMAKE_LFLAGS): QMAKE_LFLAGS = ${LDFLAGS}" >> $mkspec
-    sed -i $mkspec \
-        -e 's:${RECIPE_SYSROOT}:$$[QT_SYSROOT]:' \
-        -e 's:${TARGET_PREFIX}:$$[QT_HOST_BINS]/${TARGET_SYS}/${TARGET_PREFIX}:'
-
     # Generate a toolchain file for using Qt without running setup-environment script
-    cat > ${SDK_OUTPUT}${SDKPATHNATIVE}/usr/share/cmake/Qt6Toolchain.cmake <<EOF
-set(ENV{PATH} "${SDKPATHNATIVE}${bindir}${PATH_DELIM}${SDKPATHNATIVE}${bindir}/${TARGET_SYS}${PATH_DELIM}\$ENV{PATH}")
-set(ENV{CC} "${TARGET_PREFIX}gcc ${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}")
-set(ENV{CXX} "${TARGET_PREFIX}g++ ${TARGET_CC_ARCH} --sysroot=${SDKTARGETSYSROOT}")
+    cat > ${SDK_OUTPUT}${NATIVE_SYSROOT}/usr/share/cmake/Qt6Toolchain.cmake <<EOF
+cmake_minimum_required(VERSION 3.11)
+include_guard(GLOBAL)
 
-set(ENV{CFLAGS} "${TARGET_CFLAGS}")
-set(ENV{CXXFLAGS} "${TARGET_CXXFLAGS}")
+get_filename_component(SYSROOTS \${CMAKE_CURRENT_LIST_DIR}/../../../.. ABSOLUTE)
 
-set(ENV{OECORE_NATIVE_SYSROOT} "${SDKPATHNATIVE}")
-set(ENV{OECORE_TARGET_SYSROOT} "${SDKTARGETSYSROOT}")
-set(ENV{SDKTARGETSYSROOT} "${SDKTARGETSYSROOT}")
+set(ENV{PATH} "${NATIVE_SYSROOT}${bindir}${PATH_DELIM}\$ENV{PATH}")
+set(ENV{PKG_CONFIG_SYSROOT_DIR} "${TARGET_SYSROOT}")
+set(ENV{PKG_CONFIG_PATH} "${TARGET_SYSROOT}${libdir}/pkgconfig")
 
-set(ENV{PKG_CONFIG_SYSROOT_DIR} "${SDKTARGETSYSROOT}")
-set(ENV{PKG_CONFIG_PATH} "${SDKTARGETSYSROOT}${libdir}/pkgconfig")
+set(CMAKE_SYSTEM_NAME Linux)
+set(CMAKE_SYSROOT ${TARGET_SYSROOT})
+
+set(CMAKE_FIND_ROOT_PATH ${TARGET_SYSROOT})
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+
+set(CMAKE_SYSTEM_PROCESSOR ${TUNE_PKGARCH})
+
+set(CMAKE_C_COMPILER "${NATIVE_SYSROOT}${bindir}/${TARGET_SYS}/${TARGET_PREFIX}gcc${EXE_EXT}")
+set(CMAKE_CXX_COMPILER "${NATIVE_SYSROOT}${bindir}/${TARGET_SYS}/${TARGET_PREFIX}g++${EXE_EXT}")
+
+set(TARGET_COMPILER_FLAGS "${TARGET_CC_ARCH} --sysroot=${TARGET_SYSROOT}")
+set(TARGET_LINKER_FLAGS "${TARGET_LDFLAGS}")
+
+include(CMakeInitializeConfigs)
+
+function(cmake_initialize_per_config_variable _PREFIX _DOCSTRING)
+  if (_PREFIX MATCHES "CMAKE_(C|CXX|ASM)_FLAGS")
+    set(CMAKE_\${CMAKE_MATCH_1}_FLAGS_INIT "\${TARGET_COMPILER_FLAGS}")
+
+    foreach (config DEBUG RELEASE MINSIZEREL RELWITHDEBINFO)
+      if (DEFINED TARGET_COMPILER_FLAGS_\${config})
+        set(CMAKE_\${CMAKE_MATCH_1}_FLAGS_\${config}_INIT "\${TARGET_COMPILER_FLAGS_\${config}}")
+      endif()
+    endforeach()
+  endif()
+
+  if (_PREFIX MATCHES "CMAKE_(SHARED|MODULE|EXE)_LINKER_FLAGS")
+    foreach (config SHARED MODULE EXE)
+      set(CMAKE_\${config}_LINKER_FLAGS_INIT "\${TARGET_LINKER_FLAGS}")
+    endforeach()
+  endif()
+
+  _cmake_initialize_per_config_variable(\${ARGV})
+endfunction()
+
+if(CMAKE_HOST_WIN32)
+  set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+endif()
 
 if(NOT DEFINED CMAKE_INSTALL_PREFIX)
   set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT 1)
 endif()
 set(CMAKE_INSTALL_PREFIX "${prefix}" CACHE PATH "Install path prefix")
 
-set(CMAKE_TOOLCHAIN_FILE "${SDKPATHNATIVE}/usr/share/cmake/OEToolchainConfig.cmake")
-include("\${CMAKE_TOOLCHAIN_FILE}")
+# Include the toolchain configuration subscripts
+file( GLOB toolchain_config_files "\${CMAKE_CURRENT_LIST_DIR}/OEToolchainConfig.cmake.d/*.cmake" )
+foreach(config \${toolchain_config_files})
+    include(\${config})
+endforeach()
 EOF
 
-    # override qt-cmake
-    cat > ${SDK_OUTPUT}${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}/qt-cmake <<EOF
-#!/bin/sh
+    # resolve absolute paths at runtime
+    sed -i -e 's|${SDKPATH}/sysroots|\${SYSROOTS}|g' \
+        ${SDK_OUTPUT}${NATIVE_SYSROOT}/usr/share/cmake/Qt6Toolchain.cmake
 
-cmake_path="${SDKPATHNATIVE}${bindir}/cmake"
-toolchain_path="${SDKPATHNATIVE}/usr/share/cmake/Qt6Toolchain.cmake"
-exec "\$cmake_path" -DCMAKE_TOOLCHAIN_FILE="\$toolchain_path" "\$@"
+    # Conan profile
+    mkdir -p ${SDK_OUTPUT}${NATIVE_SYSROOT}/usr/share/conan
+    cat > ${SDK_OUTPUT}${NATIVE_SYSROOT}/usr/share/conan/profile <<EOF
+include(${TARGET_SYSROOT}${datadir}/conan/profile)
+[env]
+QT_CONFIGURE_MODULE=${NATIVE_SYSROOT}${QT6_INSTALL_BINDIR}/qt-configure-module
 EOF
-
-}
-
-create_qt6_sdk_files_append_sdkmingw32() {
-    sed -i -e 's|${SDKPATH}|$ENV{SDKPATH}|g' \
-        ${SDK_OUTPUT}${SDKPATHNATIVE}/usr/share/cmake/Qt6Toolchain.cmake
 }
 
 # default debug prefix map isn't valid in the SDK
 DEBUG_PREFIX_MAP = ""
-SECURITY_CFLAGS = ""
+lcl_maybe_fortify = ""

classes/qt6-cmake.bbclass

@@ -1,17 +1,24 @@
-inherit cmake python3native perlnative qt6-paths
+inherit cmake python3native perlnative pkgconfig qt6-paths
 
-DEPENDS_prepend = "qtbase-native "
+DEPENDS:prepend = "qtbase-native "
 
+QT_MESSAGE_LOG_LEVEL ?= "STATUS"
 EXTRA_OECMAKE += "\
     -DQT_CMAKE_DEBUG_EXTEND_TARGET=ON \
-    -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON \
     -DQT_BUILD_INTERNALS_NO_FORCE_SET_INSTALL_PREFIX=ON \
+    -DCMAKE_MESSAGE_LOG_LEVEL=${QT_MESSAGE_LOG_LEVEL} \
 "
-EXTRA_OECMAKE_append_class-target = "\
-    -DQT_HOST_PATH:PATH=${RECIPE_SYSROOT_NATIVE}/${prefix_native}/ \
+QT_FORCE_BUILD_TOOLS ?= "OFF"
+QT_INSTALL_EXAMPLES_SOURCES ?= "OFF"
+EXTRA_OECMAKE:append:class-target = "\
+    -DQT_HOST_PATH:PATH=${RECIPE_SYSROOT_NATIVE}${prefix_native}/ \
+    -DQT_FORCE_BUILD_TOOLS=${QT_FORCE_BUILD_TOOLS} \
+    -DQT_INSTALL_EXAMPLES_SOURCES=${QT_INSTALL_EXAMPLES_SOURCES} \
+    -D__harfbuzz_broken_config_file=TRUE \
 "
-EXTRA_OECMAKE_append_class-nativesdk = "\
-    -DQT_HOST_PATH:PATH=${RECIPE_SYSROOT_NATIVE}/${prefix_native}/ \
+EXTRA_OECMAKE:append:class-nativesdk = "\
+    -DQT_HOST_PATH:PATH=${RECIPE_SYSROOT_NATIVE}${prefix_native}/ \
+    -DQT_FORCE_BUILD_TOOLS=ON \
 "
 
 EXTRA_OECMAKE += "\
@@ -32,9 +39,23 @@ EXTRA_OECMAKE += "\
     -DINSTALL_MKSPECSDIR:PATH=${@os.path.relpath(d.getVar('QT6_INSTALL_MKSPECSDIR'), d.getVar('prefix') + '/')} \
 "
 
-do_install_append() {
+do_install:append() {
     # Replace host paths with qmake built-in properties QTBUG-84725
+    # remove all references to TMPDIR that could not be replaced QTBUG-105877
     find ${D} \( -name "*.pri" -or -name "*.prl" \) -exec \
         sed -i -e 's|${STAGING_DIR_NATIVE}|$$[QT_HOST_PREFIX/get]|g' \
-               -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' {} \;
+               -e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \
+               -e '/QMAKE_PRL_BUILD_DIR/d' \
+               -e '\|${WORKDIR}|d' {} \;
+
+    # Remove buildpaths from SBOM files
+    # QTBUG-130557
+    if [ -e ${D}${QT6_INSTALL_LIBDIR}/sbom ]; then
+        sed -i ${D}${QT6_INSTALL_LIBDIR}/sbom/*.spdx \
+            -e 's|${STAGING_DIR_NATIVE}||' \
+            -e 's|${S}||g' \
+            -e 's|${B}||'
+    fi
 }
+
+export QT_DISABLE_SHADER_DISK_CACHE = "1"

classes/qt6-paths.bbclass

@@ -12,7 +12,7 @@ QT6_INSTALL_ARCHDATADIR ?= "${libdir}"
 QT6_INSTALL_PLUGINSDIR ?= "${libdir}/plugins"
 # Helper programs [ARCHDATADIR/bin on Windows, ARCHDATADIR/libexec otherwise]
 QT6_INSTALL_LIBEXECDIR ?= "${libexecdir}"
-QT6_INSTALL_LIBEXECDIR_mingw32 ?= "${bindir}"
+QT6_INSTALL_LIBEXECDIR:mingw32 ?= "${bindir}"
 # QML2 imports [ARCHDATADIR/qml]
 QT6_INSTALL_QMLDIR ?= "${libdir}/qml"
 # "Arch-independent data [PREFIX]
@@ -27,7 +27,7 @@ QT6_INSTALL_SYSCONFDIR ?= "${sysconfdir}/xdg"
 QT6_INSTALL_EXAMPLESDIR ?= "${datadir}/examples"
 # Tests [PREFIX/tests]
 QT6_INSTALL_TESTSDIR ?= "${prefix}/tests"
-# Module description files directory [DATADIR/modules]
-QT6_INSTALL_DESCRIPTIONSDIR ?= "${datadir}/modules"
+# Module description files directory [ARCHDATADIR/modules]
+QT6_INSTALL_DESCRIPTIONSDIR ?= "${libdir}/modules"
 # Mkspecs files [PREFIX/mkspecs]
 QT6_INSTALL_MKSPECSDIR ?= "${libdir}/mkspecs"

classes/qt6-qmake.bbclass

@@ -12,26 +12,25 @@ 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_BINDIR_NATIVE}"
+
+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}"
 QMAKE_MKSPEC_PATH_TARGET = "${STAGING_LIBDIR}"
 
 QMAKE_MKSPEC_PATH = "${QMAKE_MKSPEC_PATH_TARGET}"
-QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}"
-QMAKE_MKSPEC_PATH_class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}"
+QMAKE_MKSPEC_PATH:class-native = "${QMAKE_MKSPEC_PATH_NATIVE}"
+QMAKE_MKSPEC_PATH:class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}"
 
-DEPENDS_prepend = "qtbase-native "
+DEPENDS:prepend = "qtbase-native "
 
 # hardcode linux, because that's what 0001-Add-linux-oe-g-platform.patch adds
-XPLATFORM_toolchain-clang = "linux-oe-clang"
+XPLATFORM:toolchain-clang = "linux-oe-clang"
 XPLATFORM ?= "linux-oe-g++"
 
 OE_QMAKE_PLATFORM_NATIVE = "${XPLATFORM}"
@@ -63,7 +62,7 @@ EXTRA_OEMAKE = " \
     OE_QMAKE_INCDIR_QT='${STAGING_DIR_TARGET}/${OE_QMAKE_PATH_HEADERS}' \
 "
 
-OE_QMAKE_QMAKE = "${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake"
+OE_QMAKE_QMAKE = "${OE_QMAKE_PATH_HOST_BINS}/qmake"
 export OE_QMAKE_CC = "${CC}"
 export OE_QMAKE_CFLAGS = "${CFLAGS}"
 export OE_QMAKE_CXX = "${CXX}"
@@ -80,40 +79,7 @@ export OE_QMAKE_QTCONF_PATH = "${WORKDIR}/qt.conf"
 
 inherit qt6-paths remove-libtool
 
-generate_target_qt_config_file() {
-    qtconf="$1"
-    cat > "${qtconf}" <<EOF
-[Paths]
-Prefix = ${OE_QMAKE_PATH_PREFIX}
-Headers = ${OE_QMAKE_PATH_HEADERS}
-Libraries = ${OE_QMAKE_PATH_LIBS}
-ArchData = ${OE_QMAKE_PATH_ARCHDATA}
-Data = ${OE_QMAKE_PATH_DATA}
-Binaries = ${OE_QMAKE_PATH_BINS}
-LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}
-Plugins = ${OE_QMAKE_PATH_PLUGINS}
-Qml2Imports = ${OE_QMAKE_PATH_QML}
-Translations = ${OE_QMAKE_PATH_TRANSLATIONS}
-Documentation = ${OE_QMAKE_PATH_DOCS}
-Settings = ${OE_QMAKE_PATH_SETTINGS}
-Examples = ${OE_QMAKE_PATH_EXAMPLES}
-Tests = ${OE_QMAKE_PATH_TESTS}
-HostBinaries = ${OE_QMAKE_PATH_BINS}
-HostData = ${OE_QMAKE_PATH_ARCHDATA}
-HostLibraries = ${OE_QMAKE_PATH_LIBS}
-HostSpec = ${OE_QMAKE_PLATFORM}
-TargetSpec = ${OE_QMAKE_PLATFORM}
-ExternalHostBinaries = ${OE_QMAKE_PATH_BINS}
-Sysroot =
-EOF
-}
-
 do_generate_qt_config_file() {
-    generate_qt_config_file_paths
-    generate_qt_config_file_effective_paths
-}
-
-generate_qt_config_file_paths() {
     cat > ${OE_QMAKE_QTCONF_PATH} <<EOF
 [Paths]
 Prefix = ${OE_QMAKE_PATH_PREFIX}
@@ -124,34 +90,24 @@ Data = ${OE_QMAKE_PATH_DATA}
 Binaries = ${OE_QMAKE_PATH_BINS}
 LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}
 Plugins = ${OE_QMAKE_PATH_PLUGINS}
-Qml2Imports = ${OE_QMAKE_PATH_QML}
+QmlImports = ${OE_QMAKE_PATH_QML}
 Translations = ${OE_QMAKE_PATH_TRANSLATIONS}
 Documentation = ${OE_QMAKE_PATH_DOCS}
 Settings = ${OE_QMAKE_PATH_SETTINGS}
 Examples = ${OE_QMAKE_PATH_EXAMPLES}
 Tests = ${OE_QMAKE_PATH_TESTS}
+HostPrefix = ${OE_QMAKE_PATH_HOST_PREFIX}
 HostBinaries = ${OE_QMAKE_PATH_HOST_BINS}
 HostData = ${OE_QMAKE_PATH_HOST_DATA}
 HostLibraries = ${OE_QMAKE_PATH_HOST_LIBS}
 HostLibraryExecutables = ${OE_QMAKE_PATH_HOST_LIBEXECS}
 HostSpec = ${OE_QMAKE_PLATFORM_NATIVE}
 TargetSpec = ${OE_QMAKE_PLATFORM}
-ExternalHostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}
 Sysroot = ${STAGING_DIR_TARGET}
 SysrootifyPrefix=true
 EOF
 }
 
-generate_qt_config_file_effective_paths() {
-    cat >> ${OE_QMAKE_QTCONF_PATH} <<EOF
-[EffectivePaths]
-HostBinaries = ${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}
-HostLibraries = ${STAGING_LIBDIR_NATIVE}
-HostData = ${OE_QMAKE_PATH_HOST_DATA}
-HostPrefix = ${STAGING_DIR_NATIVE}
-HostLibraryExecutables = ${STAGING_LIBEXECDIR_NATIVE}
-EOF
-}
 #
 # Allows to override following values (as in version 5.0.1)
 # Prefix The default prefix for all paths.
@@ -162,7 +118,7 @@ EOF
 # Binaries The location of installed Qt binaries (tools and applications).
 # Plugins The location of installed Qt plugins.
 # Imports The location of installed QML extensions to import (QML 1.x).
-# Qml2Imports The location of installed QML extensions to import (QML 2.x).
+# QmlImports The location of installed QML extensions to import (QML 2.x).
 # ArchData The location of general architecture-dependent Qt data.
 # Data The location of general architecture-independent Qt data.
 # Translations The location of translation information for Qt strings.
@@ -175,7 +131,6 @@ EOF
 # HostPrefix The prefix for host tools when cross compiling (building tools for both systems)
 # HostBinaries The location where to install host tools
 # HostData The location where to install host data
-# ExternalHostBinaries The location where we already have host tools (when cross compiling, but reusing existing tools)
 # TargetSpec The location where to install target mkspec
 # HostSpec The location where to install host mkspec
 
@@ -239,7 +194,7 @@ do_configure () {
     ${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT} ${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST -- $QMAKE_VARSUBST_CONFIGURE || die "Error calling $CMD"
 }
 
-do_install_class-native() {
+do_install:class-native() {
     oe_runmake install INSTALL_ROOT=${D}
     find "${D}" -ignore_readdir_race -name "*.la" -delete
     if ls ${D}${libdir}/pkgconfig/Qt5*.pc >/dev/null 2>/dev/null; then

classes/srcrev-update.bbclass

@@ -1,7 +1,10 @@
 python do_srcrev_update() {
     import subprocess
 
-    recipe = d.getVar("FILE")
+    recipe = d.getVar('FILE')
+    srcrev_file = os.path.join(d.getVar('QT6BASE'), 'recipes-qt/qt6/qt6-git.inc')
+
+    module = d.getVar('QT_MODULE')
 
     scms = []
     fetcher = bb.fetch2.Fetch(d.getVar('SRC_URI').split(), d)
@@ -13,33 +16,25 @@ python do_srcrev_update() {
     if len(scms) == 0:
         return
 
-    if len(scms) == 1 and len(urldata[scms[0]].names) == 1:
-        ud = urldata[scms[0]]
-        rev = ud.method.latest_revision(ud, d, ud.names[0])
-        srcrev = d.getVar("SRCREV")
-
-        if srcrev == rev:
-            bb.plain("%s SRCREV: %s is already latest" % (recipe, srcrev))
-            return
-
-        bb.plain("%s SRCREV: %s -> %s" % (recipe, srcrev, rev))
-        cmd = "sed -i %s -e 's/%s/%s/'" % (recipe, srcrev, rev)
-        bb.process.run(cmd, log=None, shell=True, stderr=subprocess.PIPE, cwd=None)
-        return
-
+    d.setVar("__BBSEENSRCREV", "1")
+    d.setVar("__BBSRCREV_SEEN", "1")
     for scm in scms:
         ud = urldata[scm]
-        for name in ud.names:
-            rev = ud.method.latest_revision(ud, d, name)
-            srcrev = d.getVar("SRCREV_%s" % name)
+        if hasattr(ud, 'names'):
+            name = ud.names[0]
+        else:
+            name = ud.name
+        rev = ud.method.latest_revision(ud, d, name)
+        srcrev = d.getVar("SRCREV_%s" % name)
+        if srcrev is None: srcrev = d.getVar("SRCREV")
 
-            if srcrev == rev:
-                bb.plain("%s SRCREV_%s: %s is already latest" % (recipe, name, srcrev))
-                continue
+        if srcrev == rev:
+            bb.plain("%s: %s is already latest" % (name, srcrev))
+            continue
 
-            bb.plain("%s SRCREV_%s: %s -> %s" % (recipe, name, srcrev, rev))
-            cmd = "sed -i %s -e 's/%s/%s/'" % (recipe, srcrev, rev)
-            bb.process.run(cmd, log=None, shell=True, stderr=subprocess.PIPE, cwd=None)
+        bb.plain("%s: %s -> %s" % (name, srcrev, rev))
+        cmd = "sed -E -i %s %s -e '/SRCREV(_%s)? /s/%s/%s/'" %  (recipe, srcrev_file, name, srcrev, rev)
+        bb.process.run(cmd, log=None, shell=True, stderr=subprocess.PIPE, cwd=None)
 }
 do_srcrev_update[nostamp] = "1"
 addtask srcrev_update after do_fetch

classes/verify-qt-version.bbclass

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

coin/dependencies.yaml

@@ -1,2 +1,5 @@
+product_dependency:
+  ../../qt/qt5:
+      ref: "dev"
 dependencies:
   {}

coin/module_config.yaml

@@ -7,20 +7,23 @@ accept_configuration:
       equals_value: Yocto
     - condition: property
       property: target.arch
-      in_values: [TARGET1, TARGET2, TARGET3, TARGET4]
+      in_values: [TARGET1, TARGET2, TARGET3, TARGET4, TARGET5, TARGET6, TARGET7]
 
 machine_type:
   Build:
-    cores: 8
+    cores: 16
 
 # Target build matrix:
 #
-#           [target1]       [target2]   [target3]       [target4]
-# [machine] qemuarm64       qemux86     qemuarm         qemux86-64
-# [yocto]   hardknott       dunfell     gatesgarth      master
-# [X11]     no              no          yes             yes
-# [mingw]   no              yes         no              no
-#
+#             [target1] [target2]  [target3] [target4]  [target5] [target6] [target7]
+# [machine]   qemuarm64 qemux86-64 qemuarm   qemux86    qemuarm64 qemuarm64 qemuarm64
+# [yocto]     master    walnascar  scarthgap whinlatter scarthgap master    master
+# [wayland]   yes       no         yes       yes        yes       no        yes
+# [x11]       no        yes        yes       no         no        yes       yes
+# [opengl]    yes       yes        yes       yes        yes       no        yes
+# [mingw]     no        no         yes       no         no        no        no
+# [static]    no        no         no        no         yes       no        no
+# [toolchain] gcc       gcc        gcc       gcc        gcc       gcc       clang
 
 target1: &target1
   type: Group
@@ -29,11 +32,14 @@ target1: &target1
       variableName: MACHINE
       variableValue: qemuarm64
     - type: EnvironmentVariable
-      variableName: YOCTO_BRANCH
-      variableValue: hardknott
+      variableName: MANIFEST
+      variableValue: master.xml
     - type: EnvironmentVariable
-      variableName: DISABLE_X11
-      variableValue: true
+      variableName: TEST_CONFIGS
+      variableValue: ci configs wayland opengl
+    - type: EnvironmentVariable
+      variableName: CHECK_COMPATIBILITY
+      variableValue: 1
   enable_if:
       condition: property
       property: target.arch
@@ -43,16 +49,13 @@ target2: &target2
   instructions:
     - type: EnvironmentVariable
       variableName: MACHINE
-      variableValue: qemux86
+      variableValue: qemux86-64
     - type: EnvironmentVariable
-      variableName: YOCTO_BRANCH
-      variableValue: dunfell
+      variableName: MANIFEST
+      variableValue: walnascar.xml
     - type: EnvironmentVariable
-      variableName: DISABLE_X11
-      variableValue: true
-    - type: EnvironmentVariable
-      variableName: MINGW
-      variableValue: true
+      variableName: TEST_CONFIGS
+      variableValue: ci configs x11 opengl
   enable_if:
       condition: property
       property: target.arch
@@ -64,8 +67,11 @@ target3: &target3
       variableName: MACHINE
       variableValue: qemuarm
     - type: EnvironmentVariable
-      variableName: YOCTO_BRANCH
-      variableValue: gatesgarth
+      variableName: MANIFEST
+      variableValue: scarthgap.xml
+    - type: EnvironmentVariable
+      variableName: TEST_CONFIGS
+      variableValue: ci configs mingw wayland x11 opengl
   enable_if:
       condition: property
       property: target.arch
@@ -75,14 +81,65 @@ target4: &target4
   instructions:
     - type: EnvironmentVariable
       variableName: MACHINE
-      variableValue: qemux86-64
+      variableValue: qemux86
     - type: EnvironmentVariable
-      variableName: YOCTO_BRANCH
-      variableValue: master
+      variableName: MANIFEST
+      variableValue: whinlatter.xml
+    - type: EnvironmentVariable
+      variableName: TEST_CONFIGS
+      variableValue: ci configs wayland opengl
   enable_if:
       condition: property
       property: target.arch
       equals_value: TARGET4
+target5: &target5
+  type: Group
+  instructions:
+    - type: EnvironmentVariable
+      variableName: MACHINE
+      variableValue: qemuarm64
+    - type: EnvironmentVariable
+      variableName: MANIFEST
+      variableValue: scarthgap.xml
+    - type: EnvironmentVariable
+      variableName: TEST_CONFIGS
+      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:
@@ -90,6 +147,9 @@ instructions:
   - *target2
   - *target3
   - *target4
+  - *target5
+  - *target6
+  - *target7
   - type: EnvironmentVariable
     variableName: DL_DIR
     variableValue: "/mnt/yocto-cache/downloads"
@@ -110,41 +170,54 @@ instructions:
       sudo hostname $(hostname -s)-$(date +%s%N)
 
       sudo mkdir -p /mnt/yocto-cache
-      sudo mount yocto-cache.intra.qt.io:/srv/yocto-cache /mnt/yocto-cache
+      sudo mount yocto-cache.ci.qt.io:/srv/yocto-cache /mnt/yocto-cache
 
-      git clone git://git.yoctoproject.org/poky --reference /mnt/yocto-cache/mirror/poky.git
-      (cd poky; git checkout ${YOCTO_BRANCH})
-      git clone git://github.com/openembedded/meta-openembedded --reference /mnt/yocto-cache/mirror/meta-openembedded.git
-      (cd meta-openembedded; git checkout ${YOCTO_BRANCH})
-      git clone git://git.yoctoproject.org/meta-mingw --reference /mnt/yocto-cache/mirror/meta-mingw.git
-      (cd meta-mingw; git checkout ${YOCTO_BRANCH})
+      curl https://storage.googleapis.com/git-repo-downloads/repo > repo
+      chmod +x repo
 
-      source ./poky/oe-init-build-env
-      export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE SSTATE_DIR DL_DIR"
-      export DL_DIR=/mnt/yocto-cache/downloads
-      export BB_GENERATE_MIRROR_TARBALLS=1
-      export SSTATE_DIR=/mnt/yocto-cache/sstate-caches/$(sed -n -e "s/DISTRO_CODENAME.*\"\(.*\)\"/\1/p" ../poky/meta-*/conf/distro/poky.conf)-meta-qt6
+      ./repo init \
+          --repo-url git@git.qt.io:boot2qt/git-repo.git \
+          -u git://code.qt.io/yocto/boot2qt-manifest \
+          -b ci \
+          -m ${MANIFEST} \
+          --reference /mnt/yocto-cache/mirror
+      ./repo sync
+
+      source ./openembedded-core/oe-init-build-env
+
+      # check compatibility agaist current Yocto master
+      if [ -n "${CHECK_COMPATIBILITY}" ]; then
+        yocto-check-layer ${SOURCE_DIR} \
+          --dependency \
+            ../meta-openembedded/meta-oe \
+            ../meta-openembedded/meta-python \
+          --additional-layer \
+            ../meta-mingw \
+          --no-auto-dependency
+      fi
+
+      bitbake-layers add-layer ../meta-yocto/meta-poky
       bitbake-layers add-layer ../meta-openembedded/meta-oe
+      bitbake-layers add-layer ../meta-openembedded/meta-python
+      bitbake-layers add-layer ../meta-openembedded/meta-multimedia
       bitbake-layers add-layer ../meta-mingw
       bitbake-layers add-layer ${SOURCE_DIR}
 
-      if [ -n "${DISABLE_X11}" ] ; then
-        echo "DISTRO_FEATURES_remove = \"x11\"" >> conf/local.conf
-      fi
-      if [ -n "${MINGW}" ]; then
-        export SDKMACHINE=x86_64-mingw32
-      fi
+      for conf in ${TEST_CONFIGS}; do
+        echo "require ${SOURCE_DIR}/coin/test-${conf}.inc" >> conf/local.conf
+      done
 
-      echo "require ${SOURCE_DIR}/coin/test-configs.inc" >> conf/local.conf
-
-      # build all recipes found in the layer
-      bitbake $(find ${SOURCE_DIR} -name *.bb | xargs -n1 basename | sed -e 's/\([^._]*\).*/\1/')
+      # build toolchain which should include all supported recipes
+      bitbake meta-toolchain-qt6 \
+          nativesdk-packagegroup-qt6-toolchain-host \
+          packagegroup-qt6-modules \
+          packagegroup-qt6-examples
     filename: "{{.BuildDir}}/start-build"
     fileMode: 420
   - type: ExecuteCommand
     command: ["bash", "-xe", "{{.BuildDir}}/start-build"]
-    maxTimeInSeconds: 28800
-    maxTimeBetweenOutput: 28800
+    maxTimeInSeconds: 43200
+    maxTimeBetweenOutput: 7200
     userMessageOnFailure: "Build failed."
   - type: ExecuteCommand
     command: ["sudo", "umount", "/mnt/yocto-cache"]

coin/test-ci.inc

@@ -0,0 +1,5 @@
+SSTATE_DIR = "/mnt/yocto-cache/sstate-caches/${DISTRO}-${DISTRO_CODENAME}"
+BB_HASHSERVE = "yocto-cache.ci.qt.io:8686"
+DL_DIR = "/mnt/yocto-cache/downloads"
+BB_GENERATE_MIRROR_TARBALLS = "1"
+BB_NUMBER_THREADS = "8"

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,22 +1,21 @@
-PREFERRED_PROVIDER_udev = "systemd"
-# use gold
-DISTRO_FEATURES_append = " ld-is-gold"
+DISTRO = "poky"
 # use systemd
-DISTRO_FEATURES_append = " systemd"
-DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
-VIRTUAL-RUNTIME_init_manager = "systemd"
-VIRTUAL-RUNTIME_initscripts = ""
-# use wayland
-DISTRO_FEATURES_append = " wayland"
+INIT_MANAGER:forcevariable = "systemd"
 
 INHERIT += "buildstats buildstats-summary"
 INHERIT += "rm_work"
 
+# default to commercial Qt
+QT_EDITION = "commercial"
+
+LICENSE_FLAGS_ACCEPTED = "commercial_ffmpeg"
+
+# include commercial addons and enable Qt QML Compiler
+QT_COMMERCIAL_MODULES = "1"
+
 # fast compression of SDK tar package
 SDK_XZ_COMPRESSION_LEVEL = "-1"
 
-SDK_ARCHIVE_TYPE_sdkmingw32 = "zip"
-
 # be more strict with QA warnings, turn them all to errors:
 EXTRA_QA = "\
     ldflags useless-rpaths rpaths staticdev libdir xorg-driver-abi \
@@ -26,60 +25,32 @@ EXTRA_QA = "\
     unknown-configure-option symlink-to-sysroot multilib \
     invalid-packageconfig host-user-contaminated uppercase-pn \
 "
-ERROR_QA_append = "${EXTRA_QA}"
-WARN_QA_remove = "${EXTRA_QA}"
+ERROR_QA:append = "${EXTRA_QA}"
+WARN_QA:remove = "${EXTRA_QA}"
+
+# workaround for qemu
+# nativesdk-qemu-user-mips rdepends on nativesdk-bash, but it isn't a build dependency
+INSANE_SKIP:nativesdk-qemu-user-mips = "build-deps"
+
+# workaround for clang
+# nativesdk-liblldb contains reference to TMPDIR [buildpaths]
+INSANE_SKIP:append:pn-nativesdk-clang = " buildpaths"
 
 # enable thumb for broader test coverage (oe-core autobuilder doesn't have thumb enabled)
 PREFERRED_ARM_INSTRUCTION_SET              ?= "thumb"
 ARM_INSTRUCTION_SET = "${PREFERRED_ARM_INSTRUCTION_SET}"
 
-PACKAGECONFIG_append_pn-qtbase = "\
-    tslib kms gbm zstd libproxy gssapi vulkan mtdev cups \
+# enable webengine with commercial/proprietary features
+PACKAGECONFIG:append:pn-qtwebengine = " proprietary-codecs"
+
+PACKAGECONFIG:append:pn-qtbase = "\
+    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"
 
-# Use latest uninative package
-UNINATIVE_MAXGLIBCVERSION = "2.32"
-
-UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/2.9/"
-UNINATIVE_CHECKSUM[aarch64] ?= "9f25a667aee225b1dd65c4aea73e01983e825b1cb9b56937932a1ee328b45f81"
-UNINATIVE_CHECKSUM[i686] ?= "cae5d73245d95b07cf133b780ba3f6c8d0adca3ffc4e7e7fab999961d5e24d36"
-UNINATIVE_CHECKSUM[x86_64] ?= "d07916b95c419c81541a19c8ef0ed8cbd78ae18437ff28a4c8a60ef40518e423"
-
-# enable examples for all Qt modules
-PACKAGECONFIG_append_pn-qt3d = " examples"
-PACKAGECONFIG_append_pn-qt5compat = " 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-qtimageformats = " examples"
-PACKAGECONFIG_append_pn-qtmqtt = " examples"
-PACKAGECONFIG_append_pn-qtmultimedia = " examples"
-PACKAGECONFIG_append_pn-qtnetworkauth = " examples"
-PACKAGECONFIG_append_pn-qtopcua = " examples"
-PACKAGECONFIG_append_pn-qtpositioning = " examples"
-PACKAGECONFIG_append_pn-qtquick3d = " examples"
-PACKAGECONFIG_append_pn-qtquickcontrols2 = " 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-qtwayland = " examples"
-PACKAGECONFIG_append_pn-qtwebchannel = " examples"
-PACKAGECONFIG_append_pn-qtwebsockets = " 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-mingw.inc

@@ -0,0 +1 @@
+SDKMACHINE = "x86_64-mingw32"

coin/test-opengl.inc

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

coin/test-ptest.inc

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

coin/test-static.inc

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

coin/test-wayland.inc

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

coin/test-x11.inc

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

conf/layer.conf

@@ -14,6 +14,12 @@ BBPATH .= ":${LAYERDIR}"
 # We have a recipes directory, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 
+# bbappends for optional layers
+BBFILES_DYNAMIC += " \
+    meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bb \
+    meta-python:${LAYERDIR}/dynamic-layers/meta-python/*/*/*.bbappend \
+"
+
 BBFILE_COLLECTIONS += "qt6-layer"
 BBFILE_PATTERN_qt6-layer := "^${LAYERDIR}/"
 
@@ -21,21 +27,28 @@ BBFILE_PATTERN_qt6-layer := "^${LAYERDIR}/"
 # choosing carefully how this layer interacts with all of the
 # other layers.
 
-BBFILE_PRIORITY_qt6-layer = "7"
+BBFILE_PRIORITY_qt6-layer = "${BBFILE_PRIORITY_core}"
 
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
 LAYERVERSION_qt6-layer = "1"
 
-LAYERDEPENDS_qt6-layer = "core"
+LAYERDEPENDS_qt6-layer = "core openembedded-layer meta-python"
 
-LAYERSERIES_COMPAT_qt6-layer = "zeus dunfell gatesgarth hardknott"
+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}"
 
 QT_GIT_PROJECT ?= "qt"
 QT_GIT ?= "git://code.qt.io"
 QT_GIT_PROTOCOL ?= "git"
 QT_EDITION ?= "opensource"
+QT_VERSION = "6.11.0"
+
+QT_COMMERCIAL_GIT ?= "git://codereview.qt-project.org"
+QT_COMMERCIAL_GIT_PROTOCOL ?= "ssh"
+
+QT_COMMERCIAL_MODULES ?= "0"

licenses/Qt-GPL-exception-1.0

@@ -0,0 +1,22 @@
+The Qt Company GPL Exception 1.0
+
+Exception 1:
+
+As a special exception you may create a larger work which contains the
+output of this application and distribute that work under terms of your
+choice, so long as the work is not otherwise derived from or based on
+this application and so long as the work does not in itself generate
+output that contains the output from this application in its original
+or modified form.
+
+Exception 2:
+
+As a special exception, you have permission to combine this application
+with Plugins licensed under the terms of your choice, to produce an
+executable, and to copy and distribute the resulting executable under
+the terms of your choice. However, the executable must be accompanied
+by a prominent notice offering all users of the executable the entire
+source code to this application, excluding the source code of the
+independent modules, but including any changes you have made to this
+application, under the terms of this license.
+

licenses/The-Qt-Company-GPL-Exception-1.0

@@ -1,704 +0,0 @@
-This is the GNU General Public License version 3, annotated with The
-Qt Company GPL Exception 1.0:
-
--------------------------------------------------------------------------
-
-The Qt Company GPL Exception 1.0
-
-Exception 1:
-
-As a special exception you may create a larger work which contains the
-output of this application and distribute that work under terms of your
-choice, so long as the work is not otherwise derived from or based on
-this application and so long as the work does not in itself generate
-output that contains the output from this application in its original
-or modified form.
-
-Exception 2:
-
-As a special exception, you have permission to combine this application
-with Plugins licensed under the terms of your choice, to produce an
-executable, and to copy and distribute the resulting executable under
-the terms of your choice. However, the executable must be accompanied
-by a prominent notice offering all users of the executable the entire
-source code to this application, excluding the source code of the
-independent modules, but including any changes you have made to this
-application, under the terms of this license.
-
-
--------------------------------------------------------------------------
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

recipes-core/meta/build-sysroots.bbappend

@@ -0,0 +1,10 @@
+inherit populate_sdk_qt6_base
+
+TARGET_SYSROOT = "${STANDALONE_SYSROOT}"
+NATIVE_SYSROOT = "${STANDALONE_SYSROOT_NATIVE}"
+SDK_OUTPUT = ""
+
+do_qt6_support () {
+    create_qt6_sdk_files
+}
+addtask do_qt6_support after do_build_native_sysroot before do_build

recipes-core/minizip/minizip_1.2.11.bb

@@ -0,0 +1,21 @@
+SUMMARY = "Minizip Compression Library"
+DESCRIPTION = "Minizip is a part of Zlib, which is a general-purpose, patent-free, lossless data compression \
+library which is used by many different programs."
+HOMEPAGE = "http://www.winimage.com/zLibDll/minizip.html"
+SECTION = "libs"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://zip.h;beginline=14;endline=30;md5=8eaa8535a3a1a2296b303f40f75385e7"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/zlib/${PV}/zlib-${PV}.tar.xz;subdir=${BP};striplevel=1"
+UPSTREAM_CHECK_URI = "http://zlib.net/"
+
+S .= "/contrib/minizip"
+
+SRC_URI[md5sum] = "85adef240c5f370b308da8c938951a68"
+SRC_URI[sha256sum] = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"
+
+DEPENDS = "zlib"
+
+inherit autotools
+
+BBCLASSEXTEND = "native nativesdk"

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

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

recipes-python/pytest-qt/python3-pytest-qt_4.2.0.bb

@@ -0,0 +1,12 @@
+SUMMARY = "pytest support for PyQt and PySide applications"
+HOMEPAGE = "http://github.com/pytest-dev/pytest-qt"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=be0db96616c6ec3cabe975402c4c687f"
+
+SRC_URI[sha256sum] = "00a17b586dd530b6d7a9399923a40489ca4a9a309719011175f55dc6b5dc8f41"
+
+inherit pypi setuptools3
+
+DEPENDS = "python3-setuptools-scm-native"
+
+RDEPENDS:${PN} += "python3-pytest"

recipes-qt/meta/meta-toolchain-qt6.bb

@@ -1,9 +1,6 @@
-SUMMARY = "Meta package for building an installable Qt5 toolchain and SDK"
+SUMMARY = "Meta package for building an installable Qt6 toolchain and SDK"
 LICENSE = "MIT"
 
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-inherit populate_sdk populate_sdk_qt6_base
-
-TOOLCHAIN_HOST_TASK_append = " nativesdk-packagegroup-qt6-toolchain-host"
-TOOLCHAIN_TARGET_TASK_append = " packagegroup-qt6-modules"
+inherit populate_sdk populate_sdk_qt6

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

@@ -0,0 +1,37 @@
+DESCRIPTION = "Qt6 development host addon packages"
+LICENSE = "MIT"
+
+# disable sanity check for allarch packagegroup
+PACKAGE_ARCH = ""
+
+inherit packagegroup nativesdk
+
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+
+RDEPENDS:${PN} += " \
+    nativesdk-qtapplicationmanager-dev \
+    nativesdk-qtapplicationmanager-tools \
+    nativesdk-qtcanvaspainter-dev \
+    nativesdk-qtcanvaspainter-tools \
+    nativesdk-qtgrpc-dev \
+    nativesdk-qtgrpc-tools \
+    nativesdk-qtlottie-dev \
+    nativesdk-qtlottie-tools \
+    nativesdk-qtquick3d-dev \
+    nativesdk-qtquick3d-tools \
+    nativesdk-qtopcua-dev \
+    nativesdk-qtopcua-tools \
+    nativesdk-qtremoteobjects-dev \
+    nativesdk-qtremoteobjects-tools \
+    nativesdk-qtscxml-dev \
+    nativesdk-qtscxml-tools \
+    nativesdk-qtshadertools-dev \
+    nativesdk-qtshadertools-tools \
+    ${FORLINUXHOST} \
+"
+
+FORLINUXHOST:mingw32 = ""
+FORLINUXHOST = " \
+    nativesdk-qtinterfaceframework-dev nativesdk-qtinterfaceframework-tools \
+"
+

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

@@ -0,0 +1,14 @@
+DESCRIPTION = "Qt6 development host commercial packages"
+LICENSE = "MIT"
+
+# disable sanity check for allarch packagegroup
+PACKAGE_ARCH = ""
+
+inherit packagegroup nativesdk
+
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+
+RDEPENDS:${PN} += " \
+    nativesdk-qmlcompilerplus-dev \
+    nativesdk-qmlcompilerplus-tools \
+"

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

@@ -0,0 +1,18 @@
+DESCRIPTION = "Qt6 development host essential packages"
+LICENSE = "MIT"
+
+# disable sanity check for allarch packagegroup
+PACKAGE_ARCH = ""
+
+inherit packagegroup nativesdk
+
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+
+RDEPENDS:${PN} += " \
+    nativesdk-qtbase-dev \
+    nativesdk-qtbase-tools \
+    nativesdk-qtdeclarative-dev \
+    nativesdk-qtdeclarative-tools \
+    nativesdk-qttools-dev \
+    nativesdk-qttools-tools \
+"

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

@@ -1,32 +1,25 @@
 DESCRIPTION = "Qt6 development host packages"
 LICENSE = "MIT"
 
+# avoid warning with inherit_defer allarch
+PACKAGE_ARCH = ""
+
 inherit packagegroup nativesdk
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
-RDEPENDS_${PN} += " \
-    nativesdk-make \
+RDEPENDS:${PN} += " \
     nativesdk-cmake \
+    nativesdk-make \
     nativesdk-ninja \
-    nativesdk-perl-modules \
-    nativesdk-qtbase-dev \
-    nativesdk-qtbase-tools \
-    nativesdk-qtdeclarative-dev \
-    nativesdk-qtdeclarative-tools \
-    nativesdk-qtquick3d-dev \
-    nativesdk-qtquick3d-tools \
-    nativesdk-qtremoteobjects-dev \
-    nativesdk-qtremoteobjects-tools \
-    nativesdk-qtscxml-dev \
-    nativesdk-qtscxml-tools \
-    nativesdk-qttools-dev \
-    nativesdk-qttools-tools \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'nativesdk-qtwayland-dev nativesdk-qtwayland-tools', '', d)} \
+    nativesdk-packagegroup-qt6-toolchain-host-essentials \
+    nativesdk-packagegroup-qt6-toolchain-host-addons \
+    ${@bb.utils.contains('QT_COMMERCIAL_MODULES', '1', 'nativesdk-packagegroup-qt6-toolchain-host-commercial', '', d)} \
+    ${FORLINUXHOST} \
 "
 
-RDEPENDS_${PN}_remove_mingw32 = " \
-    nativesdk-cmake \
-    nativesdk-ninja \
+FORLINUXHOST:mingw32 = ""
+FORLINUXHOST = " \
     nativesdk-perl-modules \
+    nativesdk-python3-html5lib \
 "

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

@@ -7,16 +7,23 @@ inherit packagegroup
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d', '', d)} \
     qt5compat \
+    qtapplicationmanager \
+    qtcanvaspainter \
     qtcharts \
     qtcoap \
     qtconnectivity \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'qtconnectivity-tools', '', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdatavis3d', '', d)} \
     qtdeviceutilities \
+    qtdoc \
+    qtgraphs \
+    qtgrpc \
+    qthttpserver \
     qtimageformats \
+    qtinterfaceframework \
+    qtlocation \
     qtlottie \
     qtmqtt \
     qtmultimedia \
@@ -30,13 +37,42 @@ RDEPENDS_${PN} += " \
     qtscxml \
     qtsensors \
     qtserialbus \
+    qtserialbus-tools \
     qtserialport \
     qtshadertools \
     qtspeech \
     qtsvg \
+    qttasktree \
     qttranslations \
     qtvirtualkeyboard \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
     qtwebchannel \
     qtwebsockets \
 "
+
+RDEPENDS:${PN}:append:aarch64 = "\
+    qtquick3dphysics \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+"
+RDEPENDS:${PN}:append:arm = " qtquick3dphysics"
+RDEPENDS:${PN}:append:armv6 = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+"
+RDEPENDS:${PN}:append:armv7a = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+"
+RDEPENDS:${PN}:append:armv7ve = "\
+    ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtpdf', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine qtwebview', '', d)} \
+"
+RDEPENDS:${PN}:append:x86 = " qtquick3dphysics"
+RDEPENDS:${PN}:append:x86-64 = "\
+    qtquick3dphysics \
+    ${@bb.utils.contains('DISTRO_FEATURES', '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-commercial-modules.bb

@@ -0,0 +1,15 @@
+DESCRIPTION = "Qt6 commercial addon modules"
+LICENSE = "MIT"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit packagegroup
+include recipes-qt/qt6/qt6-commercial.inc
+
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+
+RDEPENDS:${PN} += " \
+    qmlcompilerplus \
+    qtinsighttracker \
+    qtvncserver \
+"

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

@@ -7,12 +7,12 @@ inherit packagegroup
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     qtbase \
     qtdeclarative \
-    qtquickcontrols2 \
+    qtdeclarative-tools \
     qttools \
+    qttools-tools \
     qttranslations-qtbase \
     qttranslations-qtdeclarative \
-    qttranslations-qtquickcontrols2 \
 "

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/packagegroups/packagegroup-qt6-modules.bb

@@ -7,7 +7,8 @@ inherit packagegroup
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     packagegroup-qt6-essentials \
     packagegroup-qt6-addons \
+    ${@bb.utils.contains('QT_COMMERCIAL_MODULES', '1', 'packagegroup-qt6-commercial-modules', '', d)} \
 "

recipes-qt/qt6/chromium-gn.inc

@@ -0,0 +1,117 @@
+require gn-utils.inc
+
+inherit linuxloader
+inherit qemu
+
+COMPATIBLE_MACHINE = "(-)"
+COMPATIBLE_MACHINE:libc-musl = "(-)"
+COMPATIBLE_MACHINE:aarch64 = "(.*)"
+COMPATIBLE_MACHINE:armv6 = "(.*)"
+COMPATIBLE_MACHINE:armv7a = "(.*)"
+COMPATIBLE_MACHINE:armv7ve = "(.*)"
+COMPATIBLE_MACHINE:x86-64 = "(.*)"
+
+# By default, passing is_official_build=true to GN causes its symbol_level
+# variable to be set to "2". This means the compiler will be passed "-g2" and
+# we will end up with a very large chrome binary (around 5Gb as of M58)
+# regardless of whether DEBUG_BUILD has been set or not. In addition, binutils,
+# file and other utilities are unable to read a 32-bit binary this size, which
+# causes it not to be stripped.
+# The solution is two-fold:
+# 1. Make sure -g is not passed on 32-bit architectures via DEBUG_FLAGS. -g is
+#    the same as -g2. -g1 generates an 800MB binary, which is a lot more
+#    manageable.
+# 2. Explicitly pass symbol_level=0 to GN. This causes -g0 to be passed
+#    instead, so that if DEBUG_BUILD is not set GN will not create a huge debug
+#    binary anyway. Since our compiler flags are passed after GN's, -g0 does
+#    not cause any issues if DEBUG_BUILD is set, as -g1 will be passed later.
+DEBUG_FLAGS:remove:arm = "-g"
+DEBUG_FLAGS:append:arm = "-g1"
+DEBUG_FLAGS:remove:x86 = "-g"
+DEBUG_FLAGS:append:x86 = "-g1"
+
+# As of Chromium 62.0.3202.94 and Yocto Rocko (GCC 7, binutils 2.29), passing
+# -g to the compiler results in many linker errors on aarch64, such as:
+# obj/third_party/WebKit/Source/modules/payments/libpayments.a(PaymentEventDataConversion.o)(.debug_loc+0x4e25): error: relocation overflow in R_AARCH64_ABS32
+DEBUG_FLAGS:remove:aarch64 = "-g"
+DEBUG_FLAGS:append:aarch64 = "-g1"
+
+# As of Chromium 60.0.3112.101 and Yocto Pyro (GCC 6, binutils 2.28), passing
+# -g to the compiler results in many linker errors on x86_64, such as:
+# obj/third_party/WebKit/Source/core/loader/libloader.a(ModuleTreeLinker.o)(.debug_loc+0x1e9a5): error: relocation overflow: reference to local symbol 82 in obj/third_party/WebKit/Source/core/loader/libloader.a(ModuleTreeLinker.o)
+# obj/third_party/WebKit/Source/core/libcore_generated.a(ScriptModule.o)(.debug_loc+0x253c): error: relocation overflow: reference to local symbol 31 in obj/third_party/WebKit/Source/core/libcore_generated.a(ScriptModule.o)
+# so we have to use the same hack described above.
+DEBUG_FLAGS:remove:x86-64 = "-g"
+DEBUG_FLAGS:append:x86-64 = "-g1"
+
+# The default debug level flag has moved from DEBUG_FLAGS to a new
+# variable starting with Yocto 'styhead' (5.1) release
+DEBUG_LEVELFLAG = "-g1"
+
+# V8's JIT infrastructure requires binaries such as mksnapshot and
+# mkpeephole to be run in the host during the build. However, these
+# binaries must have the same bit-width as the target (e.g. a x86_64
+# host targeting ARMv6 needs to produce a 32-bit binary). Instead of
+# depending on a third Yocto toolchain, we just build those binaries
+# for the target and run them on the host with QEMU.
+python do_create_v8_qemu_wrapper () {
+    """Creates a small wrapper that invokes QEMU to run some target V8 binaries
+    on the host."""
+    qemu_libdirs = [d.expand('${STAGING_DIR_HOST}${libdir}'),
+                    d.expand('${STAGING_DIR_HOST}${base_libdir}')]
+    qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST', True),
+                                    qemu_libdirs)
+    wrapper_path = d.expand('${B}')
+    bb.utils.mkdirhier(wrapper_path)
+    wrapper_path = os.path.join(wrapper_path, "v8-qemu-wrapper.sh")
+    with open(wrapper_path, 'w') as wrapper_file:
+        wrapper_file.write("""#!/bin/sh
+
+# This file has been generated automatically.
+# It invokes QEMU to run binaries built for the target in the host during the
+# build process.
+
+%s "$@"
+""" % qemu_cmd)
+    os.chmod(wrapper_path, 0o755)
+}
+
+# Some x86-64 target, such as intel-skylake-64, use AVX instructions that are
+# not supported by QEMU (https://gitlab.com/qemu-project/qemu/-/issues/164).
+# This causes the build tools to crash with QEMU when they are ran during
+# to build. Instead of using QEMU, change the wrapper to try to run the
+# tools directly, using the target dynloader.
+python do_create_v8_qemu_wrapper:x86-64 () {
+    wrapper_path = d.expand('${B}')
+    bb.utils.mkdirhier(wrapper_path)
+    wrapper_path = os.path.join(wrapper_path, "v8-qemu-wrapper.sh")
+    with open(wrapper_path, 'w') as wrapper_file:
+        wrapper_file.write("""#!/bin/sh
+
+# This file has been generated automatically.
+# It invokes target dynloader to run binaries built for the x86-64 target in the host during the
+# build process.
+
+LD_LIBRARY_PATH=%s:%s %s%s "$@"
+""" % (d.expand('${STAGING_DIR_HOST}${libdir}'), d.expand('${STAGING_DIR_HOST}${base_libdir}'),
+       d.expand('${STAGING_DIR_HOST}'), d.expand(get_linuxloader(d))))
+    os.chmod(wrapper_path, 0o755)
+}
+do_create_v8_qemu_wrapper[dirs] = "${B}"
+addtask create_v8_qemu_wrapper after do_configure before do_compile
+
+python do_write_toolchain_file () {
+    """Writes a BUILD.gn file for Yocto detailing its toolchains."""
+    toolchain_dir = d.expand("${S}/src/3rdparty/chromium/build/toolchain/yocto")
+    bb.utils.mkdirhier(toolchain_dir)
+    toolchain_file = os.path.join(toolchain_dir, "BUILD.gn")
+    write_toolchain_file(d, toolchain_file)
+}
+addtask write_toolchain_file after do_patch before do_configure
+
+do_compile[progress] = "outof:^\[(\d+)/(\d+)\]\s+"
+
+PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
+
+# There is no need to ship empty -dev packages.
+ALLOW_EMPTY:${PN}-dev = "0"

recipes-qt/qt6/gn-utils.inc

@@ -0,0 +1,134 @@
+# GN host architecture helpers.
+#
+# BUILD_ARCH's value corresponds to what uname returns as the machine name.
+# The mapping in gn_host_arch_name() tries to match several possible values
+# returned by the Linux kernel in uname(2) into the corresponding values GN
+# understands.
+def gn_host_arch_name(d):
+    """Returns a GN architecture name corresponding to the build host's machine
+    architecture."""
+    import re
+    arch_translations = {
+        r'aarch64.*': 'arm64',
+        r'arm.*': 'arm',
+        r'i[3456]86$': 'x86',
+        r'x86_64$': 'x64',
+    }
+    build_arch = d.getVar("BUILD_ARCH")
+    for arch_regexp, gn_arch_name in arch_translations.items():
+        if re.match(arch_regexp, build_arch):
+            return gn_arch_name
+    bb.fatal('Unsuported BUILD_ARCH value: "%s"' % build_arch)
+
+# GN target architecture helpers.
+#
+# Determining the target architecture is more difficult, as there are many
+# different values we can use on the Yocto side (e.g. TUNE_ARCH, TARGET_ARCH,
+# MACHINEOVERRIDES etc). What we do is define the mapping with regular,
+# non-Python variables with overrides that are generic enough (i.e. "x86"
+# instead of "i586") and then use gn_target_arch_name() to return the right
+# value with some validation.
+GN_TARGET_ARCH_NAME:aarch64 = "arm64"
+GN_TARGET_ARCH_NAME:arm = "arm"
+GN_TARGET_ARCH_NAME:x86 = "x86"
+GN_TARGET_ARCH_NAME:x86-64 = "x64"
+
+def clang_install_path(d):
+    """Return clang compiler install path."""
+    return d.getVar("STAGING_BINDIR_NATIVE")
+
+def gn_target_arch_name(d):
+    """Returns a GN architecture name corresponding to the target machine's
+    architecture."""
+    name = d.getVar("GN_TARGET_ARCH_NAME")
+    if name is None:
+        bb.fatal('Unsupported target architecture. A valid override for the '
+                 'GN_TARGET_ARCH_NAME variable could not be found.')
+    return name
+
+def gn_host_pkg_config(d):
+    """Return absolute paths to pkg-config-native."""
+    return d.getVar("STAGING_BINDIR_NATIVE") + "/" + "pkg-config-native"
+
+def gn_clang(d):
+    """Return true if using clang compiler else return false"""
+    if "clang++" in d.getVar("CXX"):
+        return "true"
+    else:
+        return "false"
+
+def gn_clang_native(d):
+    """Return true if using native clang compiler else return false"""
+    if "clang++" in d.getVar("BUILD_CXX"):
+        return "true"
+    else:
+        return "false"
+
+def write_toolchain_file(d, file_path):
+    """Creates a complete GN toolchain file in |file_path|."""
+    import string
+    # Even though we always use clang, the "clang_toolchain" GN template is too
+    # restrictive in the way it sets variables such as |cxx|. Since it is just
+    # a wrapper on top of the "gcc_toolchain" template, we keep using the
+    # latter directly to accommodate our cross-compilation needs.
+    toolchain_tmpl = string.Template(
+        'gcc_toolchain("${toolchain_name}") {\n'
+        '  cc = "${cc}"\n'
+        '  cxx = "${cxx}"\n'
+        '  ar = "${ar}"\n'
+        '  ld = cxx  # GN expects a compiler, not a linker.\n'
+        '  nm = "${nm}"\n'
+        '  readelf = "${readelf}"\n'
+        '  extra_cflags = "${extra_cflags}"\n'
+        '  extra_cppflags = "${extra_cppflags}"\n'
+        '  extra_cxxflags = "${extra_cxxflags}"\n'
+        '  extra_ldflags = "${extra_ldflags}"\n'
+        '  toolchain_args = {\n'
+        '    current_cpu = "${current_cpu}"\n'
+        '    current_os = "linux"\n'
+        '    is_clang = ${is_clang}\n'
+        '    host_pkg_config = "${host_pkg_config}"\n'
+        '  }\n'
+        '}\n'
+    )
+
+    native_toolchain = {
+        'toolchain_name': 'yocto_native',
+        'is_clang': gn_clang_native(d),
+        'current_cpu': gn_host_arch_name(d),
+        'host_pkg_config': gn_host_pkg_config(d),
+        'cc': d.expand('${BUILD_CC}'),
+        'cxx': d.expand('${BUILD_CXX}'),
+        'ar': d.expand('${BUILD_AR}'),
+        'nm': d.expand('${BUILD_NM}'),
+        'readelf': d.expand('${BUILD_PREFIX}readelf'),
+        'extra_cflags': d.expand('${BUILD_CFLAGS}'),
+        'extra_cppflags': d.expand('${BUILD_CPPFLAGS}'),
+        'extra_cxxflags': d.expand('${BUILD_CXXFLAGS}'),
+        'extra_ldflags': d.expand('${BUILD_LDFLAGS}'),
+    }
+    target_toolchain = {
+        'toolchain_name': 'yocto_target',
+        'is_clang': gn_clang(d),
+        'current_cpu': gn_target_arch_name(d),
+        'host_pkg_config': gn_host_pkg_config(d),
+        'cc': d.expand('${CC}'),
+        'cxx': d.expand('${CXX}'),
+        'ar': d.expand('${AR}'),
+        'nm': d.expand('${NM}'),
+        'readelf': d.expand('${TARGET_PREFIX}readelf'),
+        'extra_cflags': d.expand('${TARGET_CFLAGS}'),
+        'extra_cppflags': d.expand('${TARGET_CPPFLAGS}'),
+        'extra_cxxflags': d.expand('${TARGET_CXXFLAGS}'),
+        'extra_ldflags': d.expand('${TARGET_LDFLAGS}'),
+    }
+
+    with open(file_path, 'w') as toolchain_file:
+        toolchain_file.write(
+            '# This file has been generated automatically.\n'
+            '\n'
+            'import("//build/toolchain/gcc_toolchain.gni")\n'
+            '\n'
+        )
+        toolchain_file.write(toolchain_tmpl.substitute(native_toolchain))
+        toolchain_file.write(toolchain_tmpl.substitute(target_toolchain))

recipes-qt/qt6/ptest/run-ptest

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

recipes-qt/qt6/qmlcompilerplus_git.bb

@@ -0,0 +1,16 @@
+LICENSE = "The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6.inc
+include recipes-qt/qt6/qt6-commercial.inc
+
+DEPENDS += "qtbase qtdeclarative qtdeclarative-native qmlcompilerplus-native"
+
+BBCLASSEXTEND = "native nativesdk"

recipes-qt/qt6/qt-gn-native_git.bb

@@ -0,0 +1,12 @@
+require recipes-qt/qt6/qtwebengine.inc
+
+inherit native
+
+OECMAKE_SOURCEPATH = "${S}/src/gn"
+OECMAKE_TARGET_COMPILE = "gn"
+
+cmake_do_install() {
+    eval DESTDIR='${D}' ${CMAKE_VERBOSE} cmake --install '${B}'
+}
+
+INSANE_SKIP:${PN} += "already-stripped"

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

@@ -1,9 +1,16 @@
-LICENSE = "BSD-3-Clause & ( GFDL-1.3 & BSD & ( LGPL-3.0 | GPL-2.0 ) | The-Qt-Company-Commercial )"
+LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only) & BSD-3-Clause & MIT"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LICENSE.GPL;md5=c96076271561b0e3785dad260634eaa8 \
-    file://src/3rdparty/assimp/src/LICENSE;md5=d9d5275cab4fb13ae624d42ce64865de \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
+    file://src/3rdparty/assimp/LICENSE;md5=2119edef0916b0bd511cb3c731076271 \
+    file://src/3rdparty/imgui/LICENSE.imstb.txt;md5=2c03212e4ad1f727e9c2251327812596 \
+    file://src/3rdparty/imgui/LICENSE.proggyclean.txt;md5=f9db3a4f99ffc4d38de6bb590db15f31 \
+    file://src/3rdparty/imgui/LICENSE.txt;md5=875a54e93593c8b244ef6b78cacc336e \
 "
 
 inherit qt6-cmake
@@ -17,15 +24,15 @@ include recipes-qt/qt6/qt6.inc
 ASSIMP_BRANCH = "qt6_assimp"
 
 SRC_URI += " \
-    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=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 \
 "
 
-DEPENDS = "qtbase qtdeclarative qtshadertools qtshadertools-native"
+# Needed for supporting 64bit off_t
+CFLAGS:append:libc-musl = " -DIOAPI_NO_64 -D_GNU_SOURCE"
+
+DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtshadertools qtshadertools-native"
 
-PACKAGECONFIG ?= "system-assimp"
 PACKAGECONFIG[system-assimp] = "-DFEATURE_qt3d_system_assimp=ON,-DQT_FEATURE_qt3d_system_assimp=OFF,assimp"
 PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
 
-SRCREV_FORMAT = "qt3d_assimp"
-SRCREV_qt3d = "b4a6597ce8311e650f686c1c04ff2cf9800c2426"
-SRCREV_assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
+SRCREV_FORMAT = "qt3d_qt3d-assimp"

recipes-qt/qt6/qt5compat-examples_git.bb

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

recipes-qt/qt6/qt5compat_git.bb

@@ -1,11 +1,13 @@
-LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
+LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause) & BSD-2-Clause"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.LGPLv3;md5=86d02ed8764e77c1c0b194fde895a51b \
-    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
+    file://src/core5/codecs/LICENSE.QTSCIICODEC.txt;md5=f36a16de69d08da0af83ce2a672d8972 \
 "
 
 inherit qt6-cmake
@@ -13,12 +15,13 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
+ENABLE_QMLCOMPILER = "0"
+
 DEPENDS += "qtbase"
 
 PACKAGECONFIG ?= "qml"
 PACKAGECONFIG[iconv] = "-DFEATURE_iconv=ON,-DFEATURE_iconv=OFF,virtual/libiconv"
-PACKAGECONFIG[qml] = ",,qtdeclarative"
+PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "cba913b2d8feae3efc6ed37f2d319eda6ec8ad7d"

recipes-qt/qt6/qt6-commercial.inc

@@ -0,0 +1,8 @@
+python() {
+    if d.getVar('QT_EDITION') != 'commercial':
+        raise bb.parse.SkipRecipe('Available only with Commercial Qt')
+}
+
+QT_GIT = "${QT_COMMERCIAL_GIT}"
+QT_GIT_PROTOCOL = "${QT_COMMERCIAL_GIT_PROTOCOL}"
+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

@@ -1,14 +1,75 @@
 DESCRIPTION ?= "Qt is a cross-platform application development framework for desktop, embedded and mobile."
 HOMEPAGE ?= "https://www.qt.io"
 
+inherit srcrev-update
+
 QT_MODULE ?= "${BPN}"
 QT_MODULE_BRANCH ?= "dev"
-QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
+QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
+QT_MODULE_REPO ?= "${QT_MODULE}"
 
-SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE}.git;name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}"
+# for compatibility with Yocto releases before whinlatter
+BB_GIT_DEFAULT_DESTSUFFIX ?= "${BP}"
 
-CVE_PRODUCT = "qt"
+SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL};destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}"
 
-S = "${WORKDIR}/git"
+CVE_PRODUCT ?= "qt:${BPN} qt:qt"
 
-PV = "6.2.0"
+PV = "${QT_VERSION}"
+
+SRCREV = "${SRCREV_${QT_MODULE_REPO}}"
+
+SRCREV_tqtc-qmlcompilerplus = "2f2395a50b0ddb1af6b699a90cfbe2164f67b6e7"
+SRCREV_tqtc-qtinsighttracker = "ac8972a670cf492ce2d2cf4ab757c43c5291804f"
+SRCREV_tqtc-qtvncserver = "8bfcb2ede4e5021a637933ec927ce2678fdc7f0c"
+SRCREV_qt3d = "1cac4a649679618f1301aba0074dae063eac6b98"
+SRCREV_qt3d-assimp = "488a2f7af2920295ada886f113a0d563dab79b8d"
+SRCREV_qt5compat = "287be0a7793621dd4e6e780595bf20aa3ae2b2c4"
+SRCREV_qtbase = "bd04c5d7a4b907b8c4a2d2dda4ba3f24f687fb7f"
+SRCREV_qtapplicationmanager = "4bd1f1fba3f803a7284a5110e117e8d162d54065"
+SRCREV_qtcanvaspainter = "689445d357df249cdf0d5ec0437bd6b8b68368c8"
+SRCREV_qtcharts = "46a2c96f3e376bc2de0e0710ec0e143c1a784081"
+SRCREV_qtcoap = "fbd3db03f13a7d1fd79aaa2392e331a1737f7f68"
+SRCREV_qtconnectivity = "e2bee5bf54cb0ac721fd9da0884a8f5a251e63fa"
+SRCREV_qtdatavis3d = "ca8d79677e63c3111536f9b03c4184f732810498"
+SRCREV_qtdeclarative = "59da4b17158303fc671869547bcb91b675bf4702"
+SRCREV_qtdeviceutilities = "4f86edb2eb255397f849528f43f49a59d4973109"
+SRCREV_qtdoc = "42cd131492d531dc32660f79e81c6f85dbc56a12"
+SRCREV_qtgraphs = "c08c320fc36fa31b264ac3c8f0f62aa94ac41b30"
+SRCREV_qtgrpc = "2bccf14f841bca476a6f90242b30368742de4a66"
+SRCREV_qthttpserver = "648e8b021ee219c7034c357cd9a5424a3040dfad"
+SRCREV_qtimageformats = "cb96a5aa2e37e0a6d31df138d24c207c6951de3a"
+SRCREV_qtinterfaceframework = "1dfaeb1d7c2cb60b56d4c9e1ff6e622e03d86d97"
+SRCREV_qtlanguageserver = "8599dad24858f93876012bd2071d096a31dfda0a"
+SRCREV_qtlocation = "8d13de6bc6a2207eca4eded65741a28d95d433a3"
+SRCREV_qtlottie = "3a5ce6df4ba97e29e7d7dc16c2bb3e849885d8fb"
+SRCREV_qtmqtt = "4f6e8dd0f1c78926394335686cfa8537303b1a07"
+SRCREV_qtmultimedia = "074d188889891972cb456817510f62b158e9ca67"
+SRCREV_qtnetworkauth = "0b8d323ae151f3826d7b5a223d80e5293cd1ed06"
+SRCREV_qtopcua = "f4dd8c4011d4ba3d11fbaaede379de247fe09690"
+SRCREV_qtpositioning = "56ede83df68dcb1048564aa463f8b48985f5f99e"
+SRCREV_qtquick3d = "3468786a6e3320eca9d4cc6d5444636ba5d88c73"
+SRCREV_qtquick3d-assimp = "488a2f7af2920295ada886f113a0d563dab79b8d"
+SRCREV_qtquick3dphysics = "9c860d931ef38751a1bc03ef813610dbd7793469"
+SRCREV_qtquickdesigner-components = "8c9e0faa0dd8b8adf019e357212e59898a7bebfb"
+SRCREV_qtquicktimeline = "831a9978aee0e963b88f5cb122228ecb7b99b13d"
+SRCREV_qtremoteobjects = "6c1fe0e164815b540b996d3246634b5e43d3ccb9"
+SRCREV_qtscxml = "604aa8558028411a9b9ac3c4bd813231db2264d0"
+SRCREV_qtsensors = "8d6d925ae615a23c8b84b51ad3701dce78afc53c"
+SRCREV_qtserialbus = "c5d1600f1270a8e4953d1c074b9faed7d99fdd2d"
+SRCREV_qtserialport = "cc95fa549119370ef78587af749e8f17544c95cc"
+SRCREV_qtshadertools = "45ef193c92f93c7a0bf8de53163a9ca8886f8267"
+SRCREV_qtspeech = "63e490d12db7790b29fa61f0c6e0677cef7074e9"
+SRCREV_qtsvg = "7c65619dc929ebf52b63251e8601b47f2f2ee207"
+SRCREV_qttasktree = "93e1d91ac78e232c3ca6b1db0031a30d08b334dd"
+SRCREV_qttools = "369f8a1fa6ac7527227df7a99399b0428a16ba97"
+SRCREV_qttools-qlitehtml = "3fe5821dad98747d6e41c9ed54b86c3d0eee9daf"
+SRCREV_qttools-qlitehtml-litehtml = "6ca1ab0419e770e6d35a1ef690238773a1dafcee"
+SRCREV_qttranslations = "0a794041faf3e647ff9623d99754a8cfdaa68a47"
+SRCREV_qtvirtualkeyboard = "e9d1ea1624cf2c961ba4aa077090367d108b130a"
+SRCREV_qtwayland = "586e489ce426e833729c333499cb98a06fbae1b0"
+SRCREV_qtwebchannel = "227750ae26054f88c202c370930c1dccf529b7fc"
+SRCREV_qtwebengine = "152b67fa5b7862d2a63fd0574ebeb4759335b935"
+SRCREV_qtwebengine-chromium = "031a10673ee369c84b2db2669fc147adf175a3be"
+SRCREV_qtwebsockets = "f269b863b994977ae8f937620c99c60e811fcbf9"
+SRCREV_qtwebview = "374f9d6ebc7226b68b4e336a136e99e73fd42b44"

recipes-qt/qt6/qt6-lts.inc

@@ -0,0 +1,5 @@
+QT_GIT = "${QT_COMMERCIAL_GIT}"
+QT_GIT_PROTOCOL = "${QT_COMMERCIAL_GIT_PROTOCOL}"
+QT_MODULE_REPO = "tqtc-${QT_MODULE}.git"
+QT_MODULE_BRANCH := "tqtc/lts-${QT_MODULE_BRANCH}"
+

recipes-qt/qt6/qt6-ptest.inc

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

recipes-qt/qt6/qt6.inc

@@ -1,14 +1,5 @@
-inherit srcrev-update
-
 include recipes-qt/qt6/qt6-ptest.inc
 
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,"
-PACKAGECONFIG[tests] = "-DQT_BUILD_TESTS=ON,-DQT_BUILD_TESTS=OFF,"
-
-# For qmake projects
-EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'examples', 'QT_BUILD_PARTS+=examples', 'QT_BUILD_PARTS-=examples', d)}"
-EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tests', 'QT_BUILD_PARTS+=tests', 'QT_BUILD_PARTS-=tests', d)}"
-
 # If Qt6 (qtbase) is machine specific, then everything will be,
 # because the (initial) qtbase configuration becomes part of Qt5/qmake
 python __anonymous() {
@@ -21,60 +12,60 @@ python __anonymous() {
             d.setVar("PACKAGE_ARCH", tarch)
 }
 
-# Automotically add qtdeclarative-native when recipe depends on qtdeclarative
+ENABLE_QMLCOMPILER ?= "${QT_COMMERCIAL_MODULES}"
 python __anonymous() {
-    if bb.utils.contains('DEPENDS', "qtdeclarative", True, False, d):
-        d.appendVar("DEPENDS", " qtdeclarative-native")
+    if (d.getVar('QT_EDITION', True) != 'commercial' or
+        d.getVar('ENABLE_QMLCOMPILER', True) == '0' or
+        d.getVar('BPN', True) == 'qmlcompilerplus' or
+        d.getVar('CLASSOVERRIDE', True) != 'class-target'):
+        return
+    if bb.utils.contains('DEPENDS', "qtdeclarative-native", True, False, d):
+        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}"
 
-SYSROOT_DIRS_append_mingw32 = " ${QT6_INSTALL_BINDIR}"
+PACKAGE_BEFORE_PN = "${PN}-qmlplugins ${PN}-tools ${PN}-plugins"
 
-PACKAGE_BEFORE_PN = "${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-examples"
+ALLOW_EMPTY:${PN} = "1"
+ALLOW_EMPTY:${PN}-plugins = "1"
+ALLOW_EMPTY:${PN}-qmlplugins = "1"
 
-ALLOW_EMPTY_${PN} = "1"
-ALLOW_EMPTY_${PN}-plugins = "1"
-ALLOW_EMPTY_${PN}-qmlplugins = "1"
-
-RRECOMMENDS_${PN} = " \
+RRECOMMENDS:${PN} = " \
     ${PN}-plugins \
     ${PN}-qmlplugins \
 "
-RRECOMMENDS_${PN}_class-native = ""
+RRECOMMENDS:${PN}:class-native = ""
 
-RRECOMMENDS_${PN}-dev += " \
+RRECOMMENDS:${PN}-dev += " \
     ${PN}-staticdev \
 "
 
-FILES_${PN}-qmlplugins = " \
+FILES:${PN}-qmlplugins = " \
     ${QT6_INSTALL_QMLDIR} \
 "
 
-FILES_${PN}-tools = " \
+FILES:${PN}-tools = " \
     ${QT6_INSTALL_BINDIR} \
     ${QT6_INSTALL_LIBEXECDIR} \
 "
 
-FILES_${PN}-plugins = " \
+FILES:${PN}-plugins = " \
     ${QT6_INSTALL_PLUGINSDIR}/*/*${SOLIBSDEV} \
     ${QT6_INSTALL_PLUGINSDIR}/*/*/*${SOLIBSDEV} \
     ${QT6_INSTALL_PLUGINSDIR}/*/*/*/*${SOLIBSDEV} \
 "
-FILES_${PN}-plugins_mingw32 = " \
+FILES:${PN}-plugins:mingw32 = " \
     ${QT6_INSTALL_PLUGINSDIR}/*/*.dll \
     ${QT6_INSTALL_PLUGINSDIR}/*/*/*.dll \
     ${QT6_INSTALL_PLUGINSDIR}/*/*/*/*.dll \
 "
 
-FILES_${PN} += " \
+FILES:${PN} += " \
     ${QT6_INSTALL_LIBDIR}/lib*${SOLIBS} \
 "
 
-FILES_${PN}-dev += " \
+FILES:${PN}-dev += " \
     ${QT6_INSTALL_DESCRIPTIONSDIR} \
     ${QT6_INSTALL_DOCDIR} \
     ${QT6_INSTALL_INCLUDEDIR} \
@@ -82,15 +73,21 @@ FILES_${PN}-dev += " \
     ${QT6_INSTALL_LIBDIR}/*.prl \
     ${QT6_INSTALL_LIBDIR}/*.la \
     ${QT6_INSTALL_LIBDIR}/cmake \
-    ${QT6_INSTALL_LIBDIR}/metatypes \
+    ${QT6_INSTALL_ARCHDATADIR}/metatypes \
     ${QT6_INSTALL_LIBDIR}/pkgconfig \
+    ${QT6_INSTALL_ARCHDATADIR}/sbom \
     ${QT6_INSTALL_MKSPECSDIR} \
+    ${QT6_INSTALL_QMLDIR}/*.qmltypes \
+    ${QT6_INSTALL_QMLDIR}/*/*.qmltypes \
+    ${QT6_INSTALL_QMLDIR}/*/*/*.qmltypes \
+    ${QT6_INSTALL_QMLDIR}/*/*/*/*.qmltypes \
+    ${QT6_INSTALL_QMLDIR}/*/*/*/*/*.qmltypes \
     ${QT6_INSTALL_QMLDIR}/*/designer \
     ${QT6_INSTALL_QMLDIR}/*/*/designer \
     ${QT6_INSTALL_QMLDIR}/*/*/*/designer \
 "
 
-FILES_${PN}-staticdev += " \
+FILES:${PN}-staticdev += " \
     ${QT6_INSTALL_LIBDIR}/*.a \
     ${QT6_INSTALL_PLUGINSDIR}/*/*.a \
     ${QT6_INSTALL_PLUGINSDIR}/*/*.prl \
@@ -105,14 +102,9 @@ FILES_${PN}-staticdev += " \
     ${QT6_INSTALL_QMLDIR}/*/*/*/*/*.a \
     ${QT6_INSTALL_QMLDIR}/*/*/*/*/*.prl \
     ${QT6_INSTALL_LIBDIR}/objects* \
+    ${QT6_INSTALL_PLUGINSDIR}/*/objects* \
     ${QT6_INSTALL_QMLDIR}/*/objects*/ \
     ${QT6_INSTALL_QMLDIR}/*/*/objects*/ \
     ${QT6_INSTALL_QMLDIR}/*/*/*/objects*/ \
     ${QT6_INSTALL_QMLDIR}/*/*/*/*/objects*/ \
 "
-
-# Note: INSTALL_EXAMPLESDIR is not used
-FILES_${PN}-examples = " \
-    ${QT6_INSTALL_EXAMPLESDIR} \
-    ${prefix}/examples \
-"

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

@@ -0,0 +1,39 @@
+DESCRIPTION = "Qt component for application lifecycle management"
+LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GFDL-1.3-no-invariants-only & BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
+"
+
+inherit qt6-cmake
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6.inc
+
+DEPENDS += "qtbase qtdeclarative libyaml libarchive qtapplicationmanager-native"
+DEPENDS:append:libc-musl = " libexecinfo"
+RDEPENDS:${PN}:class-target = "libcrypto ${PN}-tools"
+
+EXTRA_OECMAKE += "-DQT_APPMAN_SKIP_EXCLUDE_TOOLS_FROM_DEFAULT_TARGET=ON"
+
+PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'multi-process bubblewrap', '', d)}"
+
+PACKAGECONFIG[tools-only] = "-DFEATURE_am_tools_only=ON, -DFEATURE_am_tools_only=OFF"
+PACKAGECONFIG[multi-process] = "-DFEATURE_am_multi_process=ON,-DFEATURE_am_multi_process=OFF,qtwayland"
+PACKAGECONFIG[bubblewrap] = "-DFEATURE_am_bubblewrap_container=ON,-DFEATURE_am_bubblewrap_container=OFF,,bubblewrap"
+
+PACKAGECONFIG:class-native ??= "tools-only"
+PACKAGECONFIG:class-nativesdk ??= "${PACKAGECONFIG:class-native}"
+
+FILES:${PN}-tools = "\
+    ${QT6_INSTALL_BINDIR}/appman-package-server* \
+    ${QT6_INSTALL_BINDIR}/appman-packager* \
+    ${QT6_INSTALL_BINDIR}/appman-qmltestrunner* \
+"
+
+BBCLASSEXTEND = "nativesdk native"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"

recipes-qt/qt6/qtbase-examples_git.bb

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

recipes-qt/qt6/qtbase/0001-Add-linux-oe-g-platform.patch

@@ -1,4 +1,4 @@
-From 7e15934773ea428c2a35f80a0485f700ad9891cf Mon Sep 17 00:00:00 2001
+From a08e167d51c33f91009ba27adaa083c783c1ac54 Mon Sep 17 00:00:00 2001
 From: Martin Jansa <Martin.Jansa@gmail.com>
 Date: Mon, 15 Apr 2013 04:29:32 +0200
 Subject: [PATCH] Add linux-oe-g++ platform
@@ -12,6 +12,7 @@ Upstream-Status: Inappropriate [embedded specific]
 
 Change-Id: I0591ed5da0d61d7cf1509d420e6b293582f1863c
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+
 ---
  mkspecs/features/qt.prf              |  6 ++---
  mkspecs/features/qt_functions.prf    |  4 +--
@@ -24,19 +25,19 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
  create mode 100644 mkspecs/oe-device-extra.pri
 
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 729f3ac73d..84efd90d47 100644
+index 3c4b284b68..a7545ace5c 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -150,7 +150,7 @@ import_plugins:qtConfig(static) {
-             plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
+@@ -164,7 +164,7 @@ import_plugins {
+             plug_name = $$QMAKE_PREFIX_STATICLIB$${plug}$$qtPlatformTargetSuffix($$config_variable).$$QMAKE_EXTENSION_STATICLIB
              plug_path = $$eval(QT_PLUGIN.$${plug}.PATH)
              isEmpty(plug_path): \
 -                plug_path = $$[QT_INSTALL_PLUGINS/get]
 +                plug_path = $$[QT_INSTALL_PLUGINS]
              LIBS += $$plug_path/$$plug_type/$$plug_name
          } else {
-             LIBS += -l$${plug}$$qtPlatformTargetSuffix()
-@@ -283,8 +283,8 @@ for(ever) {
+             LIBS += -l$${plug}$$qtPlatformTargetSuffix(CONFIG)
+@@ -319,8 +319,8 @@ for(ever) {
  # static builds: link qml import plugins into the target.
  contains(all_qt_module_deps, qml): \
          qtConfig(static):import_plugins:!host_build:!no_import_scan {
@@ -48,10 +49,10 @@ index 729f3ac73d..84efd90d47 100644
      # run qmlimportscanner
      qtPrepareLibExecTool(QMLIMPORTSCANNER, qmlimportscanner, , system)
 diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
-index dd780ad556..0664ef789e 100644
+index f1371c8cc6..84cbf4a476 100644
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
-@@ -91,7 +91,7 @@ defineTest(qtPrepareTool) {
+@@ -95,7 +95,7 @@ defineTest(qtPrepareTool) {
      cmd = $$eval(QT_TOOL.$${2}.binary)
      isEmpty(cmd) {
          isEmpty(5) {
@@ -60,7 +61,7 @@ index dd780ad556..0664ef789e 100644
          } else {
              instloc = $$5
          }
-@@ -136,7 +136,7 @@ defineTest(qtPrepareTool) {
+@@ -140,7 +140,7 @@ defineTest(qtPrepareTool) {
  # Forwards its arguments to qtPrepareTool but defaults the installation location to
  # $$[QT_HOST_LIBEXECS]
  defineTest(qtPrepareLibExecTool) {

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

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

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

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

recipes-qt/qt6/qtbase/0004-Fix-qt.toolchain.cmake-for-SDK-use.patch

@@ -0,0 +1,29 @@
+From a4d3698a56665cc73a18fa860c862e1b04533792 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Thu, 16 Dec 2021 13:10:48 +0200
+Subject: [PATCH] Fix qt.toolchain.cmake for SDK use
+
+The calculated paths for QT_TOOLCHAIN_RELOCATABLE paths point to
+host sysroot which must not be used when cross-compiling other projects.
+
+Change-Id: I52aa2a10d2a13fd27d6bf8b4af6dc1833c7a286a
+Upstream-Status: Inappropriate [embedded specific]
+---
+ cmake/qt.toolchain.cmake.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/qt.toolchain.cmake.in b/cmake/qt.toolchain.cmake.in
+index 15cf7a432e..03de9288df 100644
+--- a/cmake/qt.toolchain.cmake.in
++++ b/cmake/qt.toolchain.cmake.in
+@@ -67,8 +67,8 @@ get_filename_component(QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR "${CMAKE_CURRENT_LIST_
+ # Instead of collapsing the search prefix (which is the case when one is a subdir of the other),
+ # it concatenates them creating an invalid path. Workaround it by setting the root path to the
+ # Qt install prefix, and the prefix path to the lib/cmake subdir.
+-list(PREPEND CMAKE_PREFIX_PATH "${QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR}")
+-list(PREPEND CMAKE_FIND_ROOT_PATH "${QT_TOOLCHAIN_RELOCATABLE_INSTALL_PREFIX}")
++#list(PREPEND CMAKE_PREFIX_PATH "${QT_TOOLCHAIN_RELOCATABLE_CMAKE_DIR}")
++#list(PREPEND CMAKE_FIND_ROOT_PATH "${QT_TOOLCHAIN_RELOCATABLE_INSTALL_PREFIX}")
+ 
+ # Let CMake load our custom platform modules.
+ # CMake-provided platform modules take precedence.

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

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

recipes-qt/qt6/qtbase_git.bb

@@ -1,36 +1,54 @@
-LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
+LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) \
+    & GFDL-1.3-no-invariants-only) & Apache-2.0 & BSD-3-Clause & BSL-1.0 & LGPL-2.1-or-later & HPND & MIT"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-    file://LICENSE.QT-LICENSE-AGREEMENT;md5=c8b6dd132d52c6e5a545df07a4e3e283 \
+    file://LICENSES/Apache-2.0.txt;md5=b4c615f64dff32f71eeed614d13dfd4c \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/BSL-1.0.txt;md5=8c92b4c255bdcce2989707d5b8a4d302 \
+    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 \
+"
+SRC_URI:append:class-native = "\
     file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
 "
 
 DEPENDS += "\
+    patchelf-native \
     freetype \
     pcre2 \
 "
-DEPENDS_remove_class-native = "qtbase-native"
+DEPENDS:remove:class-native = "qtbase-native"
+RDEPENDS_${PN}:remove:class-native = "libssl-native"
 
-PACKAGECONFIG_class-native ?= "gui widgets png dbus no-opengl"
-PACKAGECONFIG_class-nativesdk ?= "gui widgets png dbus no-opengl"
+RRECOMMENDS:${PN}:append:libc-glibc:class-target = " locale-base-c"
+RRECOMMENDS:${PN}-ptest:append = " tzdata"
+
+PACKAGECONFIG:class-native ?= "\
+    gui widgets jpeg png dbus no-opengl openssl zlib zstd \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwaylandscanner', '', d)} \
+"
+PACKAGECONFIG:class-nativesdk ?= "${PACKAGECONFIG:class-native}"
 PACKAGECONFIG ?= "\
     ${PACKAGECONFIG_DEFAULT} \
     ${PACKAGECONFIG_GRAPHICS} \
-    ${PACKAGECONFIG_X11} \
-    ${PACKAGECONFIG_KDE} \
     ${PACKAGECONFIG_FONTS} \
     ${PACKAGECONFIG_SYSTEM} \
     ${PACKAGECONFIG_DISTRO} \
@@ -38,36 +56,69 @@ PACKAGECONFIG ?= "\
 
 PACKAGECONFIG_GRAPHICS ?= "\
     ${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)} \
+    ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \
-        bb.utils.contains('DISTRO_FEATURES', 'x11', 'gl', 'gles2', 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 xkbcommon glib', '', 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 dbus udev gui widgets icu openssl  \
-    jpeg png dbus libinput fontconfig harfbuzz \
+PACKAGECONFIG_DEFAULT ?= "\
+    accessibility \
+    ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'accessibility-atspi-bridge', '', d)} \
+    dbus \
+    fontconfig \
+    glib \
+    gui \
+    harfbuzz \
+    icu \
+    jpeg \
+    libinput \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'use-gold-linker', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', 'use-lld-linker', '', d)} \
+    openssl  \
+    png \
+    udev \
+    widgets \
+    xkbcommon \
+    zlib \
+    zstd \
     ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \
-    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'zstd', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwaylandscanner', '', d)} \
 "
+
+PACKAGECONFIG:remove:mingw32 = "openssl"
+
 # Build type: Debug, Release, MinSizeRel, RelWithDebInfo
 BUILD_TYPE ?= "Release"
 # OpenSSL linking mode: runtime, linked
 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)}"
+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 -DQT_BUILD_TESTS=OFF -DWARNINGS_ARE_ERRORS=OFF,-DFEATURE_developer_build=OFF"
+PACKAGECONFIG[use-gold-linker] = "-DFEATURE_use_gold_linker=ON"
+PACKAGECONFIG[use-bfd-linker] = "-DFEATURE_use_bfd_linker=ON"
+PACKAGECONFIG[use-lld-linker] = "-DFEATURE_use_lld_linker=ON"
 
 PACKAGECONFIG[cups] = "-DFEATURE_cups=ON,-DFEATURE_cups=OFF,cups"
 PACKAGECONFIG[dbus] = "-DFEATURE_dbus=ON,-DFEATURE_dbus=OFF,dbus"
 PACKAGECONFIG[udev] = "-DFEATURE_libudev=ON,-DFEATURE_libudev=OFF,udev"
+PACKAGECONFIG[zlib] = "-DFEATURE_system_zlib=ON,-DFEATURE_system_zlib=OFF,zlib"
 PACKAGECONFIG[zstd] = "-DFEATURE_zstd=ON,-DFEATURE_zstd=OFF,zstd"
 
 # corelib
@@ -75,25 +126,32 @@ PACKAGECONFIG[glib] = "-DFEATURE_glib=ON,-DFEATURE_glib=OFF,glib-2.0"
 PACKAGECONFIG[icu] = "-DFEATURE_icu=ON,-DFEATURE_icu=OFF,icu"
 PACKAGECONFIG[journald] = "-DFEATURE_journald=ON,-DFEATURE_journald=OFF,systemd"
 PACKAGECONFIG[lttng] = "-DFEATURE_lttng=ON,-DFEATURE_lttng=OFF,lttng-ust"
+PACKAGECONFIG[ctf] = "-DFEATURE_ctf=ON,-DFEATURE_ctf=OFF"
 
 # gui
 PACKAGECONFIG[gui] = "-DFEATURE_gui=ON,-DFEATURE_gui=OFF"
 PACKAGECONFIG[accessibility] = "-DFEATURE_accessibility=ON,-DFEATURE_accessibility=OFF"
+PACKAGECONFIG[accessibility-atspi-bridge] = "-DFEATURE_accessibility_atspi_bridge=ON,-DFEATURE_accessibility_atspi_bridge=OFF,at-spi2-core"
 PACKAGECONFIG[directfb] = "-DFEATURE_directfb=ON,-DFEATURE_directfb=OFF,directfb"
 PACKAGECONFIG[fontconfig] = "-DFEATURE_fontconfig=ON,-DFEATURE_fontconfig=OFF,fontconfig"
 PACKAGECONFIG[gbm] = "-DFEATURE_gbm=ON,-DFEATURE_gbm=OFF,virtual/libgbm"
 PACKAGECONFIG[gl] = "-DFEATURE_opengl_desktop=ON,-DFEATURE_opengl_desktop=OFF,virtual/libgl"
 PACKAGECONFIG[gles2] = "-DFEATURE_opengles2=ON,-DFEATURE_opengles2=OFF,virtual/libgles2 virtual/egl"
+PACKAGECONFIG[eglfs] = "-DFEATURE_eglfs=ON,-DFEATURE_eglfs=OFF,virtual/egl"
+PACKAGECONFIG[eglfs-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"
 PACKAGECONFIG[no-opengl] = "-DINPUT_opengl=no"
-PACKAGECONFIG[png] = "-DFEATURE_png=ON,-DFEATURE_png=OFF,libpng"
+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[xcb] = "-DFEATURE_xcb=ON,-DFEATURE_xcb=OFF,libxcb xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil"
+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"
 
 # widgets
@@ -109,45 +167,103 @@ PACKAGECONFIG[openssl] = "-DFEATURE_openssl_${OPENSSL_LINKING_MODE}=ON,-DFEATURE
 # sqldrivers
 PACKAGECONFIG[sql-mysql] = "-DFEATURE_sql_mysql=ON,-DFEATURE_sql_mysql=OFF,mysql5"
 PACKAGECONFIG[sql-odbc] = "-DFEATURE_sql_odbc=ON,-DFEATURE_sql_odbc=OFF,unixodbc"
-PACKAGECONFIG[sql-psql] = "-DFEATURE_sql_psql=ON,-DFEATURE_sql-psql=OFF,postgresql"
+PACKAGECONFIG[sql-psql] = "-DFEATURE_sql_psql=ON,-DFEATURE_sql_psql=OFF,postgresql"
 PACKAGECONFIG[sql-sqlite] = "-DFEATURE_system_sqlite=ON,-DFEATURE_sql_sqlite=OFF,sqlite3"
 
 
 EXTRA_OECMAKE += "\
     -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
     -DQT_EDITION=${QT_EDITION} \
+    -DQT_AVOID_CMAKE_ARCHIVING_API=ON \
 "
 
-EXTRA_OECMAKE_append_class-target = "\
+EXTRA_OECMAKE:append:class-target = "\
     -DFEATURE_rpath=OFF \
+    -DFEATURE_relocatable=OFF \
     -DQT_QPA_DEFAULT_PLATFORM=${QT_QPA_DEFAULT_PLATFORM} \
-    -DQT_AVOID_CMAKE_ARCHIVING_API=ON \
-    -DFEATURE_use_bfd_linker=ON \
+    -DQT_NO_GENERATE_QMAKE_WRAPPER_FOR_TARGET=ON \
+"
+
+EXTRA_OECMAKE:append:mingw32 = "\
+    -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON \
+    -DFEATURE_stack_protector=OFF \
+    -DFEATURE_dnslookup=OFF \
 "
 
 SYSROOT_DIRS += "${QT6_INSTALL_MKSPECSDIR}"
 
-do_install_append() {
-    sed -i ${D}${libdir}/cmake/Qt6BuildInternals/QtBuildInternalsExtra.cmake \
+do_install:append() {
+    sed -i ${D}${QT6_INSTALL_LIBDIR}/cmake/Qt6BuildInternals/QtBuildInternalsExtra.cmake \
         -e '/QT_SOURCE_TREE/,+2d'
 
+    sed -i ${D}${QT6_INSTALL_LIBDIR}/cmake/Qt6/Qt6Dependencies.cmake \
+        -e '/set(__qt_platform_initial_qt_host/d'
+
     # remove mac and android specific scripts that depend on perl and bash
     # to avoid file-rdeps QA Issue.
     rm -f ${D}${QT6_INSTALL_LIBEXECDIR}/android_emulator_launcher.sh
     rm -f ${D}${QT6_INSTALL_MKSPECSDIR}/features/uikit/devices.py
     rm -f ${D}${QT6_INSTALL_MKSPECSDIR}/features/uikit/device_destinations.sh
     rm -f ${D}${QT6_INSTALL_MKSPECSDIR}/features/data/mac/objc_namespace.sh
+
+    if [ -e ${D}${QT6_INSTALL_EXAMPLESDIR}/corelib/serialization/cbordump/cbortag.py ]; then
+        sed -i ${D}${QT6_INSTALL_EXAMPLESDIR}/corelib/serialization/cbordump/cbortag.py \
+            -e 's|/bin/env|/usr/bin/env|'
+    fi
+
+    # remove unneeded files that contains reference to TMPDIR [buildpaths]
+    rm -f ${D}${QT6_INSTALL_BINDIR}/host-*
+    rm -f ${D}${QT6_INSTALL_BINDIR}/target_qt.conf
+
+    install -d ${D}${datadir}/cmake/OEToolchainConfig.cmake.d
+    RELPATH=${@os.path.relpath(d.getVar('prefix'), d.getVar('datadir') + '/cmake/OEToolchainConfig.cmake.d')}
+    cat > ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/OEQt6Toolchain.cmake <<EOF
+get_filename_component(QT_HOST_PATH "\${CMAKE_CURRENT_LIST_DIR}/$RELPATH" ABSOLUTE CACHE)
+set(QT_BUILD_INTERNALS_NO_FORCE_SET_INSTALL_PREFIX ON CACHE BOOL "")
+EOF
+
+    RELPATH="${@os.path.relpath(d.getVar('bindir'), d.getVar('QT6_INSTALL_BINDIR'))}"
+    sed -i ${D}${QT6_INSTALL_BINDIR}/* \
+        -e "s|cmake_path=${RECIPE_SYSROOT_NATIVE}.*cmake|cmake_path=%script_dir_path%/$RELPATH/cmake.exe|" \
+        -e "s|${RECIPE_SYSROOT_NATIVE}.*cmake|\$script_dir_path/$RELPATH/cmake|"
+    RELPATH="${@os.path.relpath(d.getVar('bindir'), d.getVar('QT6_INSTALL_LIBEXECDIR'))}"
+    sed -i ${D}${QT6_INSTALL_LIBEXECDIR}/* \
+        -e "s|cmake_path=${RECIPE_SYSROOT_NATIVE}.*cmake|cmake_path=%script_dir_path%/$RELPATH/cmake.exe|" \
+        -e "s|${RECIPE_SYSROOT_NATIVE}.*cmake|\$script_dir_path/$RELPATH/cmake|"
+
+    RELPATH=${@os.path.relpath(d.getVar('prefix') + '/share/cmake/Qt6Toolchain.cmake', d.getVar('QT6_INSTALL_LIBDIR') + '/cmake/Qt6')}
+    sed -i ${D}${QT6_INSTALL_LIBDIR}/cmake/Qt6/qt.toolchain.cmake \
+        -e "s|/.*/toolchain.cmake|\${CMAKE_CURRENT_LIST_DIR}/$RELPATH|"
 }
 
-do_install_append_class-nativesdk() {
-    install -d ${D}${datadir}/cmake/OEToolchainConfig.cmake.d
-    cat > ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/OEQt6Toolchain.cmake <<EOF
-set(QT_HOST_PATH "\$ENV{OECORE_NATIVE_SYSROOT}/usr" CACHE PATH "")
-set(QT_BUILD_TOOLS_WHEN_CROSSCOMPILING "TRUE" CACHE BOOL "")
+do_install:append:class-target() {
+    sed >> ${D}${QT6_INSTALL_MKSPECSDIR}/linux-oe-g++/qmake.conf <<EOF \
+        -e 's: ${lcl_maybe_fortify}: :' \
+        -e 's:${DEBUG_PREFIX_MAP}::' \
+        -e 's:${RECIPE_SYSROOT}:$$[QT_SYSROOT]:' \
+        -e 's:${TARGET_PREFIX}:$$[QT_HOST_PREFIX]${bindir}/${TARGET_SYS}/${TARGET_PREFIX}:'
+
+isEmpty(QMAKE_CC): {
+    QMAKE_AR = ${AR} cqs
+    QMAKE_AR_LTCG = ${HOST_PREFIX}gcc-ar cqs
+    QMAKE_STRIP = ${STRIP}
+    QMAKE_OBJCOPY = ${OBJCOPY}
+    QMAKE_CC = ${HOST_PREFIX}gcc
+    QMAKE_CFLAGS +=  ${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS}
+    QMAKE_CXX = ${HOST_PREFIX}g++
+    QMAKE_CXXFLAGS +=  ${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS}
+    QMAKE_LINK = ${HOST_PREFIX}g++
+    QMAKE_LFLAGS += ${TARGET_CC_ARCH}${TOOLCHAIN_OPTIONS} ${TARGET_LDFLAGS}
+    }
 EOF
 }
 
-INSANE_SKIP_${PN}-ptest += "arch"
+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 \
     ${PKGD}${PTEST_PATH}/tests/auto/corelib/plugin/qpluginloader/elftest/corrupt3.elf64.so \
@@ -156,4 +272,3 @@ INHIBIT_PACKAGE_STRIP_FILES = "\
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "9ef816e13a63c1932f3464119796bdbb07c7e893"

recipes-qt/qt6/qtcanvaspainter-examples_git.bb

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

recipes-qt/qt6/qtcanvaspainter_git.bb

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

recipes-qt/qt6/qtcharts-examples_git.bb

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

recipes-qt/qt6/qtcharts_git.bb

@@ -1,6 +1,8 @@
-LICENSE = "GPL-3.0 | The-Qt-Company-Commercial"
+LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+    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 \
 "
 
 inherit qt6-cmake
@@ -11,6 +13,5 @@ include recipes-qt/qt6/qt6.inc
 DEPENDS += "qtbase"
 
 PACKAGECONFIG ?= "qml"
-PACKAGECONFIG[qml] = ",,qtdeclarative"
+PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
 
-SRCREV = "282f9aa1a5ca6cf2c853f20018a8cd6671f2934f"

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

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

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

@@ -1,10 +1,12 @@
-LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
+LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
 "
 
 inherit qt6-cmake
@@ -12,12 +14,9 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-# QTBUG-93565
-PTEST_ENABLED = "0"
-
-DEPENDS += "qtbase qtdeclarative"
+DEPENDS += "qtbase"
 
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
 PACKAGECONFIG[bluez] = "-DFEATURE_bluez=ON,-DFEATURE_bluez=OFF,bluez5"
 
-SRCREV = "003ff2cb174747b7eee4f2e299bb72e629f202e2"
+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/qtdatavis3d_git.bb

@@ -1,13 +1,16 @@
-LICENSE = "GPL-3.0 | The-Qt-Company-Commercial"
+LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GFDL-1.3-no-invariants-only"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
 "
 
-inherit qt6-cmake
+inherit qt6-cmake features_check
 
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-DEPENDS += "qtbase qtdeclarative"
+REQUIRED_DISTRO_FEATURES = "opengl"
 
-SRCREV = "e0713ad6f89eac8a4e7cbb5adfaf4daf6a91ca3c"
+DEPENDS += "qtbase qtdeclarative qtdeclarative-native"

recipes-qt/qt6/qtdeclarative-examples_git.bb

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

recipes-qt/qt6/qtdeclarative_git.bb

@@ -1,10 +1,13 @@
-LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
+LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause) & BSD-2-Clause"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
+    file://src/3rdparty/masm/LICENSE;md5=dadc3e328f07d2e6fca9177916e902b5 \
 "
 
 inherit qt6-cmake
@@ -12,8 +15,8 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native"
+DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native qtlanguageserver qtsvg"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "7fa28f98824a94396106eadfc028b329985a0cfc"
+INSANE_SKIP:${PN}-ptest += "buildpaths"

recipes-qt/qt6/qtdeviceutilities-examples_git.bb

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

recipes-qt/qt6/qtdeviceutilities_git.bb

@@ -1,11 +1,18 @@
-LICENSE = "GPL-3.0 | The-Qt-Company-Commercial"
-LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
+LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
+    "
 
 inherit qt6-cmake
-include recipes-qt/qt6/qt6.inc
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6.inc
 
-DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtvirtualkeyboard"
-RDEPENDS_${PN} = "connman"
+DEPENDS = "qtbase qtdeclarative qtdeclarative-native"
+RDEPENDS:${PN} = "connman"
 
-SRCREV = "10c59319e196f717e569a9a0bfc45ae73d88d1fd"

recipes-qt/qt6/qtdoc-examples_git.bb

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

recipes-qt/qt6/qtdoc_git.bb

@@ -0,0 +1,23 @@
+LICENSE = "The-Qt-Company-Commercial | (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only & BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=caa060942f6b722bc4329d4195584c38 \
+"
+
+inherit qt6-cmake
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6.inc
+
+DEPENDS = "\
+    qtbase \
+    qtdeclarative \
+    qtdeclarative-native \
+    qttasktree \
+"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"

recipes-qt/qt6/qtgraphs-examples_git.bb

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

recipes-qt/qt6/qtgraphs_git.bb

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

recipes-qt/qt6/qtgrpc-examples_git.bb

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

recipes-qt/qt6/qtgrpc_git.bb

@@ -0,0 +1,23 @@
+LICENSE = "The-Qt-Company-Commercial | (LGPL-3.0-only | GPL-2.0-only) & (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 qtgrpc-native protobuf protobuf-native"
+
+PACKAGECONFIG ?= "qml"
+PACKAGECONFIG[qml] = "-DFEATURE_grpcquick=ON,-DFEATURE_grpcquick=OFF,qtdeclarative qtdeclarative-native"
+
+BBCLASSEXTEND = "native nativesdk"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"

recipes-qt/qt6/qthttpserver-examples_git.bb

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

recipes-qt/qt6/qthttpserver_git.bb

@@ -0,0 +1,17 @@
+LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only & BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6.inc
+
+DEPENDS += "qtbase"
+
+PACKAGECONFIG ?= "websockets"
+PACKAGECONFIG[websockets] = ",,qtwebsockets"

recipes-qt/qt6/qtimageformats_git.bb

@@ -1,14 +1,10 @@
-LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
+LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
-    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+    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
@@ -18,10 +14,9 @@ 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"
 PACKAGECONFIG[webp] = "-DFEATURE_webp=ON,-DFEATURE_webp=OFF,libwebp"
 
-SRCREV = "770e1e57197b2137db59605189dfa8d575ff343f"

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/qtinsighttracker_git.bb

@@ -0,0 +1,12 @@
+LICENSE = "The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187"
+
+inherit qt6-cmake
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6.inc
+include recipes-qt/qt6/qt6-commercial.inc
+
+DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
+
+FILES:${PN} += "${QT6_INSTALL_DATADIR}/qtinsight"

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

@@ -0,0 +1,30 @@
+DESCRIPTION = "Qt Interface Framework"
+LICENSE = "The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & GFDL-1.3-no-invariants-only & BSD-3-Clause"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
+"
+
+inherit qt6-cmake
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6.inc
+
+FILES:${PN}-dev += " \
+    ${QT6_INSTALL_DATADIR}/ifcodegen-templates \
+    "
+
+DEPENDS += "qtbase qtdeclarative qtdeclarative-native qtinterfaceframework-native"
+
+PACKAGECONFIG ?= "ifcodegen remoteobjects"
+PACKAGECONFIG:append:class-native = " host-tools-only"
+PACKAGECONFIG:append:class-nativesdk = " host-tools-only"
+
+PACKAGECONFIG[host-tools-only] = "-DFEATURE_host_tools_only=ON,-DFEATURE_host_tools_only=OFF"
+PACKAGECONFIG[ifcodegen] = "-DFEATURE_ifcodegen=ON,-DFEATURE_ifcodegen=OFF,python3-qface,python3-qface"
+PACKAGECONFIG[remoteobjects] = "-DFEATURE_remoteobjects=ON,-DFEATURE_remoteobjects=OFF,qtremoteobjects qtremoteobjects-native"
+
+BBCLASSEXTEND = "native nativesdk"

recipes-qt/qt6/qtlanguageserver_git.bb

@@ -0,0 +1,19 @@
+LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & (LGPL-3.0-only | GPL-2.0-only) & GFDL-1.3-no-invariants-only"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+"
+
+inherit qt6-cmake
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6.inc
+
+DEPENDS += "qtbase"
+
+BBCLASSEXTEND = "native nativesdk"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"

recipes-qt/qt6/qtlocation-examples_git.bb

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

recipes-qt/qt6/qtlocation_git.bb

@@ -0,0 +1,26 @@
+LICENSE = "(The-Qt-Company-Commercial | GPL-3.0-only & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only) & BSD-3-Clause & MIT"
+LIC_FILES_CHKSUM = " \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/MIT.txt;md5=3605d54ecceddcd50962eb89318779ec \
+"
+
+inherit qt6-cmake
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6.inc
+
+DEPENDS += "qtbase qtpositioning"
+
+PACKAGECONFIG ?= "osm qml"
+PACKAGECONFIG[esri] = "-DFEATURE_geoservices_esri=ON,-DFEATURE_geoservices_esri=OFF,"
+PACKAGECONFIG[mapbox] = "-DFEATURE_geoservices_mapbox=ON,-DFEATURE_geoservices_mapbox=OFF,"
+PACKAGECONFIG[nokia] = "-DFEATURE_geoservices_nokia=ON,-DFEATURE_geoservices_nokia=OFF,"
+PACKAGECONFIG[osm] = "-DFEATURE_geoservices_osm=ON,-DFEATURE_geoservices_osm=OFF,"
+PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
+
+INSANE_SKIP:${PN}-ptest += "buildpaths"

recipes-qt/qt6/qtlottie_git.bb

@@ -1,7 +1,8 @@
-LICENSE = "(GPL-3.0 & The-Qt-Company-GPL-Exception-1.0) | The-Qt-Company-Commercial"
+LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+    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 \
 "
 
 inherit qt6-cmake
@@ -9,6 +10,11 @@ inherit qt6-cmake
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
 
-DEPENDS += "qtbase qtdeclarative"
+DEPENDS += "\
+    qtbase \
+    qtdeclarative \
+    qtdeclarative-native \
+    qtlottie-native \
+"
 
-SRCREV = "6748a346438abc5f43bde3a0de33c0ee51f33f32"
+BBCLASSEXTEND = "native nativesdk"

recipes-qt/qt6/qtmqtt-examples_git.bb

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

recipes-qt/qt6/qtmqtt_git.bb

@@ -1,7 +1,9 @@
-LICENSE = "(GPL-3.0 & The-Qt-Company-GPL-Exception-1.0) | The-Qt-Company-Commercial"
+LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+    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 \
 "
 
 inherit qt6-cmake
@@ -10,7 +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 qtwebsockets"
-
-SRCREV = "e22417694d294c539120d8684d71d95a81bd2b40"

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

@@ -1,10 +1,16 @@
-LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
+LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-3.0-only) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only ) & Apache-2.0 & BSD-3-Clause & MPL-2.0"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
+    file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \
+    file://src/3rdparty/resonance-audio/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+    file://src/3rdparty/eigen/COPYING.BSD;md5=bb155c6d1ebb4543dc4b7b5f33fa40ec \
+    file://src/3rdparty/eigen/COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \
+    file://src/3rdparty/pffft/LICENSE;md5=0f39e43e9bc20e7e103e54750e1ec3a2 \
 "
 
 inherit qt6-cmake
@@ -14,12 +20,18 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtshadertools qtshadertools-native"
 
-PACKAGECONFIG ?= "gstreamer qml"
+PACKAGECONFIG ?= "\
+    ${@bb.utils.contains_any('LICENSE_FLAGS_ACCEPTED','commercial commercial_ffmpeg','ffmpeg','',d)} \
+    gstreamer pulseaudio qml spatialaudio spatialaudio_quick3d"
+
 PACKAGECONFIG[alsa] = "-DFEATURE_alsa=ON,-DFEATURE_alsa=OFF,alsa-lib"
-PACKAGECONFIG[pulseaudio] = "-DFEATURE_pulseaudio=ON,-DFEATURE_pulseaudio=OFF,pulseaudio"
+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[qml] = ",,qtdeclarative"
+PACKAGECONFIG[pulseaudio] = "-DFEATURE_pulseaudio=ON,-DFEATURE_pulseaudio=OFF,pulseaudio"
+PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
+PACKAGECONFIG[spatialaudio] = "-DFEATURE_spatialaudio=ON,-DFEATURE_spatialaudio=OFF"
+PACKAGECONFIG[spatialaudio_quick3d] = "-DFEATURE_spatialaudio_quick3d=ON,-DFEATURE_spatialaudio_quick3d=OFF,qtquick3d qtquick3d-native"
+PACKAGECONFIG[vaapi] = "-DFEATURE_vaapi=ON,-DFEATURE_vaapi=OFF,libva"
 
-EXTRA_OECMAKE += "-DFEATURE_gpu_vivante=OFF"
-
-SRCREV = "7d3e538096384ce996ec948068f8e7efa52e0868"
+QT_DEFAULT_MEDIA_BACKEND ?= "${@bb.utils.contains('PACKAGECONFIG', 'gstreamer', 'gstreamer', 'ffmpeg', d)}"
+EXTRA_OECMAKE += "-DQT_DEFAULT_MEDIA_BACKEND=${QT_DEFAULT_MEDIA_BACKEND}"

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/qtnetworkauth_git.bb

@@ -1,7 +1,9 @@
-LICENSE = "BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial"
+LICENSE = "The-Qt-Company-Commercial | GPL-3.0-only & GFDL-1.3-no-invariants-only & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+    file://LICENSES/BSD-3-Clause.txt;md5=cb40fa7520502d8c7a3aea47cae1316c \
+    file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+    file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \
 "
 
 inherit qt6-cmake
@@ -11,4 +13,3 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-SRCREV = "5d840b0955aef9a46f44a8a0786e6026f8012ae3"

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 \
+"