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

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

README.md

@@ -3,28 +3,58 @@ 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.
+
+Each Qt release is tagged either as `v6.x.y` or `v6.x.y-lts`
 
 Following table shows the Yocto branches which are used to test each
-Qt version.
+Qt version (x) and any additional Yocto releases that are stated in
+the LAYERSERIES_COMPAT (c).
 
-| Yocto \ Qt | dev | 6.1 | 6.0 |
+| Yocto \ Qt | 6.2 | 6.1 | 6.0 |
 | ---------- |:---:|:---:|:---:|
-| master     |  x  |     |     |
-| hardknott  |  x  |  x  |  x  |
-| gatesgarth |  x  |  x  |  x  |
+| kirkstone  |  x  |     |     |
+| honister   |  x  |     |     |
+| hardknott  |  c  |  x  |  x  |
+| gatesgarth |  c  |  x  |  x  |
 | dunfell    |  x  |  x  |  x  |
 
+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.
+
+QtWebEngine
+-----------
+
+QtWebEngine needs at least CMake 3.19, which is available starting from Hardknott.
+For this reason QtWebEngine is not tested on older releases.
+
 Contributing
 ------------
 

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,22 @@
 inherit qt6-paths
 
-SDK_POSTPROCESS_COMMAND_prepend = "create_qt6_sdk_files;"
-
+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
@@ -28,22 +31,23 @@ create_qt6_sdk_files () {
     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 +60,80 @@ 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}")
+set(QT_BUILD_INTERNALS_NO_FORCE_SET_INSTALL_PREFIX ON CACHE BOOL "")
 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,20 @@
-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}/ \
+EXTRA_OECMAKE:append:class-target = "\
+    -DQT_HOST_PATH:PATH=${RECIPE_SYSROOT_NATIVE}${prefix_native}/ \
+    -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON \
 "
-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_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON \
 "
 
 EXTRA_OECMAKE += "\
@@ -32,9 +35,10 @@ 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
     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' {} \;
 }

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]

classes/qt6-qmake.bbclass

@@ -13,25 +13,25 @@ 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_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_EXTERNAL_HOST_BINS = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_HOST_BINS}"
 
 # This is useful for target recipes to reference native mkspecs
 QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}"
 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}"
@@ -149,7 +149,7 @@ 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}
+HostLibraryExecutables = ${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_HOST_LIBEXECS}
 EOF
 }
 #
@@ -239,7 +239,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(os.path.dirname(recipe), 'qt6-git.inc')
+
+    module = d.getVar('QT_MODULE')
 
     scms = []
     fetcher = bb.fetch2.Fetch(d.getVar('SRC_URI').split(), d)
@@ -13,32 +16,20 @@ 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")
     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 srcrev is None: srcrev = d.getVar("SRCREV")
 
             if srcrev == rev:
-                bb.plain("%s SRCREV_%s: %s is already latest" % (recipe, name, srcrev))
+                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.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"

coin/dependencies.yaml

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

coin/module_config.yaml

@@ -11,13 +11,13 @@ accept_configuration:
 
 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
+# [yocto]   kirkstone       honister    kirkstone       dunfell
 # [X11]     no              no          yes             yes
 # [mingw]   no              yes         no              no
 #
@@ -29,11 +29,11 @@ target1: &target1
       variableName: MACHINE
       variableValue: qemuarm64
     - type: EnvironmentVariable
-      variableName: YOCTO_BRANCH
-      variableValue: hardknott
+      variableName: MANIFEST
+      variableValue: kirkstone.xml
     - type: EnvironmentVariable
-      variableName: DISABLE_X11
-      variableValue: true
+      variableName: TEST_CONFIGS
+      variableValue: ci configs post-inclusive wayland
   enable_if:
       condition: property
       property: target.arch
@@ -45,14 +45,11 @@ target2: &target2
       variableName: MACHINE
       variableValue: qemux86
     - type: EnvironmentVariable
-      variableName: YOCTO_BRANCH
-      variableValue: dunfell
+      variableName: MANIFEST
+      variableValue: honister.xml
     - type: EnvironmentVariable
-      variableName: DISABLE_X11
-      variableValue: true
-    - type: EnvironmentVariable
-      variableName: MINGW
-      variableValue: true
+      variableName: TEST_CONFIGS
+      variableValue: ci configs pre-inclusive wayland mingw no-webengine
   enable_if:
       condition: property
       property: target.arch
@@ -64,8 +61,11 @@ target3: &target3
       variableName: MACHINE
       variableValue: qemuarm
     - type: EnvironmentVariable
-      variableName: YOCTO_BRANCH
-      variableValue: gatesgarth
+      variableName: MANIFEST
+      variableValue: kirkstone.xml
+    - type: EnvironmentVariable
+      variableName: TEST_CONFIGS
+      variableValue: ci configs post-inclusive
   enable_if:
       condition: property
       property: target.arch
@@ -77,8 +77,11 @@ target4: &target4
       variableName: MACHINE
       variableValue: qemux86-64
     - type: EnvironmentVariable
-      variableName: YOCTO_BRANCH
-      variableValue: master
+      variableName: MANIFEST
+      variableValue: dunfell.xml
+    - type: EnvironmentVariable
+      variableName: TEST_CONFIGS
+      variableValue: ci configs pre-inclusive no-webengine
   enable_if:
       condition: property
       property: target.arch
@@ -110,41 +113,38 @@ 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
+
+      ./repo init \
+          --repo-url https://github.com/theqtcompany/git-repo \
+          -u git://code.qt.io/yocto/boot2qt-manifest \
+          -b ci \
+          -m ${MANIFEST} \
+          --reference /mnt/yocto-cache/mirror
+      ./repo sync
 
       source ./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
       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
     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-configs.inc

@@ -1,22 +1,24 @@
 PREFERRED_PROVIDER_udev = "systemd"
 # use gold
-DISTRO_FEATURES_append = " ld-is-gold"
+DISTRO_FEATURES:append = " ld-is-gold"
 # use systemd
-DISTRO_FEATURES_append = " systemd"
+DISTRO_FEATURES:append = " systemd"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 VIRTUAL-RUNTIME_initscripts = ""
-# use wayland
-DISTRO_FEATURES_append = " wayland"
 
 INHERIT += "buildstats buildstats-summary"
 INHERIT += "rm_work"
 
+# default to commercial Qt
+QT_EDITION = "commercial"
+
+# 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 +28,64 @@ 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}"
 
 # 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 = "\
+# enable webengine with commercial/proprietary features
+DISTRO_FEATURES:append = " webengine"
+PACKAGECONFIG:append:pn-qtwebengine = " proprietary-codecs"
+
+PACKAGECONFIG:append:pn-qtbase = "\
     tslib kms gbm zstd libproxy gssapi vulkan mtdev cups \
     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"
-
-# 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"
+PACKAGECONFIG:append:pn-qtimageformats = " jasper"
 
 # 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"
+PACKAGECONFIG:append:pn-qmlcompilerplus = " examples"
+PACKAGECONFIG:append:pn-qt3d = " examples"
+PACKAGECONFIG:append:pn-qt5compat = " examples"
+PACKAGECONFIG:append:pn-qtapplicationmanager = " examples"
+PACKAGECONFIG:append:pn-qtbase = " examples"
+PACKAGECONFIG:append:pn-qtcharts = " examples"
+PACKAGECONFIG:append:pn-qtcoap = " examples"
+PACKAGECONFIG:append:pn-qtconnectivity = " examples"
+PACKAGECONFIG:append:pn-qtdatavis3d = " examples"
+PACKAGECONFIG:append:pn-qtdeclarative = " examples"
+PACKAGECONFIG:append:pn-qtdeviceutilities = " examples"
+PACKAGECONFIG:append:pn-qtimageformats = " examples"
+PACKAGECONFIG:append:pn-qtinsighttracker = " examples"
+PACKAGECONFIG:append:pn-qtinterfaceframework = " examples"
+PACKAGECONFIG:append:pn-qtlanguageserver = " examples"
+PACKAGECONFIG:append:pn-qtlottie = " examples"
+PACKAGECONFIG:append:pn-qtmqtt = " examples"
+PACKAGECONFIG:append:pn-qtmultimedia = " examples"
+PACKAGECONFIG:append:pn-qtnetworkauth = " examples"
+PACKAGECONFIG:append:pn-qtopcua = " examples"
+PACKAGECONFIG:append:pn-qtpdf = " examples"
+PACKAGECONFIG:append:pn-qtpositioning = " examples"
+PACKAGECONFIG:append:pn-qtquick3d = " examples"
+PACKAGECONFIG:append:pn-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-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-qtwebengine = " examples"
+PACKAGECONFIG:append:pn-qtwebsockets = " examples"
+PACKAGECONFIG:append:pn-qtwebview = " examples"

coin/test-mingw.inc

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

coin/test-no-webengine.inc

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

coin/test-post-inclusive.inc

@@ -0,0 +1 @@
+LICENSE_FLAGS_ACCEPTED = "commercial"

coin/test-pre-inclusive.inc

@@ -0,0 +1 @@
+LICENSE_FLAGS_WHITELIST = "commercial"

coin/test-wayland.inc

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

conf/layer.conf

@@ -14,6 +14,11 @@ BBPATH .= ":${LAYERDIR}"
 # We have a recipes directory, add to BBFILES
 BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"
 
+# bbappends for optional layers
+BBFILES_DYNAMIC += " \
+    openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes*/*/*.bbappend \
+"
+
 BBFILE_COLLECTIONS += "qt6-layer"
 BBFILE_PATTERN_qt6-layer := "^${LAYERDIR}/"
 
@@ -21,7 +26,7 @@ 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
@@ -29,7 +34,7 @@ LAYERVERSION_qt6-layer = "1"
 
 LAYERDEPENDS_qt6-layer = "core"
 
-LAYERSERIES_COMPAT_qt6-layer = "zeus dunfell gatesgarth hardknott"
+LAYERSERIES_COMPAT_qt6-layer = "dunfell gatesgarth hardknott honister kirkstone"
 
 LICENSE_PATH += "${LAYERDIR}/licenses"
 
@@ -39,3 +44,14 @@ QT_GIT_PROJECT ?= "qt"
 QT_GIT ?= "git://code.qt.io"
 QT_GIT_PROTOCOL ?= "git"
 QT_EDITION ?= "opensource"
+QT_VERSION = "6.2.12"
+
+QT_COMMERCIAL_GIT ?= "git://codereview.qt-project.org"
+QT_COMMERCIAL_GIT_PROTOCOL ?= "ssh"
+
+QT_COMMERCIAL_MODULES ?= "0"
+
+# License mapping back to old license files
+SPDXLICENSEMAP[GPL-3.0-only] = "GPL-3.0"
+SPDXLICENSEMAP[LGPL-3.0-only] = "LGPL-3.0"
+SPDXLICENSEMAP[GPL-2.0-or-later] = "GPL-2.0"

dynamic-layers/openembedded-layer/recipes-graphics/spir/spirv-tools_%.bbappend

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

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"
+UPSTREAM_CHECK_URI = "http://zlib.net/"
+
+S = "${WORKDIR}/zlib-${PV}/contrib/minizip"
+
+SRC_URI[md5sum] = "85adef240c5f370b308da8c938951a68"
+SRC_URI[sha256sum] = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"
+
+DEPENDS = "zlib"
+
+inherit autotools
+
+BBCLASSEXTEND = "native nativesdk"

recipes-devtools/python/python3-antlr4-runtime_4.9.2.bb

@@ -0,0 +1,9 @@
+PYPI_PACKAGE = "antlr4-python3-runtime"
+inherit pypi setuptools3
+
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://PKG-INFO;md5=c96f0ee5f5d08fd4387e5f00507bb13e"
+
+SRC_URI[sha256sum] = "31f5abdc7faf16a1a6e9bf2eb31565d004359b821b09944436a34361929ae85a"
+
+BBCLASSEXTEND = "nativesdk native"

recipes-devtools/python/python3-path_16.2.0.bb

@@ -0,0 +1,8 @@
+inherit pypi setuptools3
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6"
+
+SRC_URI[sha256sum] = "2de925e8d421f93bcea80d511b81accfb6a7e6b249afa4a5559557b0cf817097"
+
+BBCLASSEXTEND = "nativesdk native"

recipes-devtools/python/python3-pathtools3_0.2.1.bb

@@ -0,0 +1,8 @@
+inherit pypi setuptools3
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=56bd93578433bb99b4fdf7ff481722df"
+
+SRC_URI[sha256sum] = "630c1edc09ef93abea40fc06b10067e5734d8f38cc85867bc61d1a5c9eb7796f"
+
+BBCLASSEXTEND = "nativesdk native"

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

@@ -0,0 +1,21 @@
+inherit pypi setuptools3
+
+DEPS += " python3-jinja2 \
+          python3-click \
+          python3-pyyaml \
+          python3-pytest \
+          python3-six \
+          python3-path \
+          python3-antlr4-runtime \
+          python3-watchdog \
+          python3-markupsafe \
+          python3-setuptools \
+        "
+DEPENDS += "${DEPS}"
+RDEPENDS:${PN} += "${DEPS}"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=eee61e10a40b0e3045ee5965bcd9a8b5"
+SRC_URI[sha256sum] = "42b0a0d37ed77cf1a9994f5ed77e3a6138468241df1700667a9ab0b848d6ad57"
+
+BBCLASSEXTEND = "nativesdk native"

recipes-devtools/python/python3-watchdog_0.9.0.bb

@@ -0,0 +1,11 @@
+DEPS = "python3-pathtools3"
+DEPENDS = "${DEPS}"
+RDEPENDS:${PN} = "${DEPS}"
+inherit pypi setuptools3
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+SRC_URI[sha256sum] = "965f658d0732de3188211932aeb0bb457587f04f63ab4c1e33eab878e9de961d"
+
+BBCLASSEXTEND = "nativesdk native"

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,31 @@
+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-qtquick3d-dev \
+    nativesdk-qtquick3d-tools \
+    nativesdk-qtremoteobjects-dev \
+    nativesdk-qtremoteobjects-tools \
+    nativesdk-qtscxml-dev \
+    nativesdk-qtscxml-tools \
+    nativesdk-qtshadertools-dev \
+    nativesdk-qtshadertools-tools \
+    nativesdk-qtwayland-dev \
+    nativesdk-qtwayland-tools \
+    ${FORLINUXHOST} \
+"
+
+FORLINUXHOST:mingw32 = ""
+FORLINUXHOST = " \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'nativesdk-qtinterfaceframework-dev nativesdk-qtinterfaceframework-tools', '', d)} \
+"
+

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

@@ -0,0 +1,11 @@
+DESCRIPTION = "Qt6 development host commercial packages"
+LICENSE = "MIT"
+
+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

@@ -5,27 +5,16 @@ inherit packagegroup nativesdk
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     nativesdk-make \
-    nativesdk-cmake \
-    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 = " \
+FORLINUXHOST:mingw32 = ""
+FORLINUXHOST = " \
     nativesdk-cmake \
     nativesdk-ninja \
     nativesdk-perl-modules \

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

@@ -7,9 +7,10 @@ inherit packagegroup
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qt3d', '', d)} \
     qt5compat \
+    qtapplicationmanager \
     qtcharts \
     qtcoap \
     qtconnectivity \
@@ -17,6 +18,7 @@ RDEPENDS_${PN} += " \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'qtdatavis3d', '', d)} \
     qtdeviceutilities \
     qtimageformats \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-python', 'qtinterfaceframework', '', d)} \
     qtlottie \
     qtmqtt \
     qtmultimedia \
@@ -32,11 +34,13 @@ RDEPENDS_${PN} += " \
     qtserialbus \
     qtserialport \
     qtshadertools \
-    qtspeech \
     qtsvg \
     qttranslations \
     qtvirtualkeyboard \
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \
     qtwebchannel \
     qtwebsockets \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebengine-tools', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'webengine', 'qtwebview', '', d)} \
 "

recipes-qt/packagegroups/packagegroup-qt6-commercial-modules.bb

@@ -0,0 +1,13 @@
+DESCRIPTION = "Qt6 commercial addon modules"
+LICENSE = "MIT"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+inherit packagegroup
+
+PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
+
+RDEPENDS:${PN} += " \
+    qmlcompilerplus \
+    qtinsighttracker \
+"

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

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

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,112 @@
+require gn-utils.inc
+
+inherit linuxloader
+inherit qemu
+
+COMPATIBLE_MACHINE = "(-)"
+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"
+
+# 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/conan.inc

@@ -0,0 +1,52 @@
+# Generate Conan profile
+do_install:append:class-target() {
+    install -d ${D}${datadir}/conan
+    cat > ${D}${datadir}/conan/profile <<EOF
+[settings]
+os=Linux
+arch=${@map_conan_arch(d.getVar('TARGET_ARCH'), d)}
+compiler=gcc
+compiler.version=$(${CC} -dumpfullversion | cut -d . -f 1,2)
+compiler.libcxx=libstdc++11
+build_type=${BUILD_TYPE}
+[options]
+qtbase:cmake_args_qtbase="${@cmake_args_qtbase(d)}"
+*:cmake_args_leaf_module=""
+[build_requires]
+[env]
+CONAN_CMAKE_GENERATOR=${OECMAKE_GENERATOR}
+EOF
+}
+
+def map_conan_arch(a, d):
+    import re
+
+    valid_archs = "x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, \
+                  armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, \
+                  sparc, sparcv9, mips, mips64, avr, s390, s390x, asm.js, wasm, sh4le, \
+                  e2k-v2, e2k-v3, e2k-v4, e2k-v5, e2k-v6, e2k-v7, xtensalx6, xtensalx106"
+
+    if   re.match('i.86$', a):                  return 'x86'
+    elif re.match('x86.64$', a):                return 'x86_64'
+    elif re.match('arm$', a):                   return 'arm'
+    elif re.match('aarch64$', a):               return 'armv8'
+    elif re.match('mips(isa32)?(el)?$', a):     return 'mips'
+    elif re.match('mips(isa)?(64)?(el)?$', a):  return 'mips64'
+    elif re.match('p(pc|owerpc)$', a):          return 'ppc32be'
+    elif re.match('p(pc|owerpc)le$', a):        return 'ppc32'
+    elif re.match('p(pc|owerpc)64$', a):        return 'ppc64'
+    elif re.match('p(pc|owerpc)64le$', a):      return 'ppc64le'
+    elif re.match('sh4$', a):                   return 'sh4le'
+    elif a in valid_archs:                      return a
+    else:
+        bb.warn("cannot map '%s' to a conan architecture" % a)
+
+def cmake_args_qtbase(d):
+    import re
+    rm_args = ['-DQT_HOST_PATH[^ ]*']
+    args = d.getVar('EXTRA_OECMAKE')
+    for arg in rm_args:
+        args = re.sub(arg, '', args)
+    return args
+
+FILES:${PN}-dev += "${datadir}/conan"

recipes-qt/qt6/gn-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/gn-utils.inc

@@ -0,0 +1,111 @@
+# 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 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 = false\n'
+        '  }\n'
+        '}\n'
+    )
+
+    native_toolchain = {
+        'toolchain_name': 'yocto_native',
+        'current_cpu': gn_host_arch_name(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',
+        'current_cpu': gn_target_arch_name(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/qmlcompilerplus_git.bb

@@ -0,0 +1,16 @@
+LICENSE = "The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = " \
+    file://src/qmlcompilerplus/cppcodegen_p.h;endline=27;md5=6a1dccd03d0d5864357e72b67def8ff2 \
+"
+
+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"
+
+PTEST_ENABLED = "0"
+
+BBCLASSEXTEND = "native nativesdk"

recipes-qt/qt6/qt3d_git.bb

@@ -1,8 +1,10 @@
-LICENSE = "BSD-3-Clause & ( GFDL-1.3 & BSD & ( LGPL-3.0 | GPL-2.0 ) | The-Qt-Company-Commercial )"
+LICENSE = "BSD-3-Clause & ( GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0-or-later | LGPL-3.0-only ) | The-Qt-Company-Commercial )"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv3;md5=8211fde12cc8a4e2477602f5953f5b71 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
-    file://LICENSE.GPL;md5=c96076271561b0e3785dad260634eaa8 \
+    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSE.FDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
     file://src/3rdparty/assimp/src/LICENSE;md5=d9d5275cab4fb13ae624d42ce64865de \
 "
 
@@ -12,20 +14,18 @@ inherit features_check
 REQUIRED_DISTRO_FEATURES = "opengl"
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 ASSIMP_BRANCH = "qt6_assimp"
 
 SRC_URI += " \
-    ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=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=git/src/3rdparty/assimp/src \
 "
 
-DEPENDS = "qtbase qtdeclarative qtshadertools qtshadertools-native"
+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_git.bb

@@ -1,4 +1,4 @@
-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 = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0-or-later | LGPL-3.0-only ) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
     file://LICENSE.LGPLv3;md5=86d02ed8764e77c1c0b194fde895a51b \
@@ -11,14 +11,14 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
 PACKAGECONFIG ?= "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,9 @@
+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 = "tqtc-${BPN}"
+QT_MODULE_BRANCH := "tqtc/lts-${QT_MODULE_BRANCH}"

recipes-qt/qt6/qt6-git.inc

@@ -2,13 +2,60 @@ DESCRIPTION ?= "Qt is a cross-platform application development framework for des
 HOMEPAGE ?= "https://www.qt.io"
 
 QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "dev"
-QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
+QT_MODULE_BRANCH ?= "6.2"
+QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1"
+QT_MODULE_REPO ?= "${QT_MODULE}.git"
 
-SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE}.git;name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}"
+SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}"
 
-CVE_PRODUCT = "qt"
+CVE_PRODUCT:append = " qt"
 
 S = "${WORKDIR}/git"
 
-PV = "6.2.0"
+PV = "${QT_VERSION}"
+
+SRCREV = "${SRCREV_${QT_MODULE}}"
+
+SRCREV_tqtc-qmlcompilerplus = "95321d2c5ddcdfe0081e7b5d578de2970d70046f"
+SRCREV_tqtc-qtinsighttracker = "d2ff8a524f415b6dac4f3fee5961b4744436f228"
+SRCREV_qt3d = "0eb30b403ee7638c24251a1116455b739444471c"
+SRCREV_qt3d-assimp = "c60a259fd35f09b8896b2920d48c436145914aae"
+SRCREV_qt5compat = "d4641367e7987a0e96721c59baa188ff143df3c4"
+SRCREV_qtbase = "d15a975ed751b8a5484a25a9036c90f97b053e1d"
+SRCREV_qtapplicationmanager = "5a1b3b74f1eb51f9840b4b734462d6b27e8d33df"
+SRCREV_qtcharts = "e1ef9fe82cb48eb2f1dd1bdd9d74c60f7813110a"
+SRCREV_qtcoap = "c4dcf26dbbb0bf51211d55d64d69bd4976342fcb"
+SRCREV_qtconnectivity = "52526726cfccb341c7e01e3fec964bbb2540fc85"
+SRCREV_qtdatavis3d = "50f62d45aac231a636d822e9910073ce1844a2dd"
+SRCREV_qtdeclarative = "5880b113a6dcd08cb84b542f86b9f6b90b626514"
+SRCREV_qtdeviceutilities = "55ad100680f35c6011b06fd2ea1cfbef81e87d21"
+SRCREV_qtimageformats = "c979e3aa3393e0b8c8243790c66304266e3ccc7f"
+SRCREV_qtinterfaceframework = "75d2ee0e96c5941c6272b383d5bd650f80a037f9"
+SRCREV_qtlottie = "2b88725c34e684c0a152d39f0160074322808abd"
+SRCREV_qtmqtt = "d9eefc661841d21af9e450e16c2c8b55f095665f"
+SRCREV_qtmultimedia = "38fcbcfadddc78d7b442541a43265b24932673f7"
+SRCREV_qtnetworkauth = "acf745f8dbfe595195d6baf5f802b1b7774e0bc5"
+SRCREV_qtopcua = "2928c5e530213c3379c6523ab30ec8c953ecb73c"
+SRCREV_qtpositioning = "434b0697b4883d31200e4dfbfec7a73eed4bbbf6"
+SRCREV_qtquick3d = "f574189be9f95150e6eb38af9dd851870225d403"
+SRCREV_qtquick3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
+SRCREV_qtquickdesigner-components = "5683c8ae8fbf22755fd6e4fefe9db0714e49d892"
+SRCREV_qtquicktimeline = "248a39c7475c31f0940d7669689dd8c31b87f1eb"
+SRCREV_qtremoteobjects = "c1ccf030ec815ba63e0b52de1aa9106aaf683fe2"
+SRCREV_qtscxml = "583ade083df85782d7c5a1cb8ae8e857050548a1"
+SRCREV_qtsensors = "20704e8996a0b8c8f9e911c2a160844a0e09f4e0"
+SRCREV_qtserialbus = "a41a54d4a8513cfdfad3121fb1beb8ec059a9a56"
+SRCREV_qtserialport = "85aefdf573f493cd8cf555c4d546c08d2e502782"
+SRCREV_qtshadertools = "90cf07c959c0084f417dfffb5114bb276432ea65"
+SRCREV_qtsvg = "fad3fff872c7f8e5783549db906c0407a88c626d"
+SRCREV_qttools = "44da00e46a4a2329927f7f6e1d2e58d1fbd8ba87"
+SRCREV_qttools-qlitehtml = "4931b7aa30f256c20573d283561aa432fecf8f38"
+SRCREV_qttools-qlitehtml-litehtml = "6236113734bb0a28467e5999e86fdd2834be8e01"
+SRCREV_qttranslations = "c8eda2ddd06c1e735de8dd892aaacc4deccf8789"
+SRCREV_qtvirtualkeyboard = "fb7986f581b029cb2f47563eeff3bad6b7081b41"
+SRCREV_qtwayland = "8b1c03649445e9afcbadad751608d7006c547265"
+SRCREV_qtwebchannel = "3519d388fb64dfa2404a0a73afb4f598e42534b7"
+SRCREV_qtwebengine = "d82e573d693bb21398779216c06b335412a8bfa8"
+SRCREV_qtwebengine-chromium = "524df60af8ebd0c35fb3d1cc5f53d5ddf442a95e"
+SRCREV_qtwebsockets = "2f51931eff2c8588b1ec94f70419787c9954d0f1"
+SRCREV_qtwebview = "e2ceb38bc8d2969420e06bf945f99b789b2d10f1"

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,9 +1,21 @@
-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}= \
+"
+
 fakeroot do_install_ptest() {
+    cat >${WORKDIR}/toolchain-ptest.cmake <<EOF
+include(${WORKDIR}/toolchain.cmake)
+list(PREPEND CMAKE_FIND_ROOT_PATH ${D})
+EOF
+
     if [ -n "${OE_QMAKE_QMAKE}" ]; then
         # qmake project
         B_PTEST=${B}
@@ -18,11 +30,13 @@ fakeroot do_install_ptest() {
         cd ${B_PTEST}
         cmake \
             ${OECMAKE_GENERATOR_ARGS} \
-            -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
+            -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain-ptest.cmake \
+            -DPython3_EXECUTABLE=${PYTHON} \
             ${EXTRA_OECMAKE} \
             -DQT_BUILD_STANDALONE_TESTS=ON \
-            -DQT_ADDITIONAL_PACKAGES_PREFIX_PATH="${D}${QT6_INSTALL_LIBDIR}/cmake;${RECIPE_SYSROOT}/${QT6_INSTALL_LIBDIR}/cmake" \
             -DCMAKE_STAGING_PREFIX=${D}${prefix} \
+            -DCMAKE_SKIP_RPATH=ON \
+            -DQT_DISABLE_NO_DEFAULT_PATH_IN_QT_PACKAGES=ON \
             ${S} \
             -Wno-dev
         ${CMAKE_VERBOSE} cmake --build ${B_PTEST} --target all
@@ -48,4 +62,11 @@ fakeroot do_install_ptest() {
     fi
 }
 
-INSANE_SKIP_${PN}-ptest += "file-rdeps"
+INSANE_SKIP:${PN}-ptest += "file-rdeps"
+
+PACKAGESPLITFUNCS =+ "remove_ptest_debug"
+remove_ptest_debug() {
+    if [ -e ${PKGD}${QT6_INSTALL_LIBDIR}/${BPN}/ptest/tests/auto ]; then
+        find ${PKGD}${QT6_INSTALL_LIBDIR}/${BPN}/ptest/tests/auto -depth -type d -name .debug -exec rm -rf '{}' \;
+    fi
+}

recipes-qt/qt6/qt6.inc

@@ -21,60 +21,65 @@ 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"
+INSANE_SKIP:${PN}-dbg += "libdir"
+INSANE_SKIP:${PN}-examples += "libdir dev-so"
 
-SYSROOT_DIRS_append_mingw32 = " ${QT6_INSTALL_BINDIR}"
+SYSROOT_DIRS += "${QT6_INSTALL_BINDIR} ${QT6_INSTALL_LIBEXECDIR}"
 
 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} \
@@ -85,12 +90,17 @@ FILES_${PN}-dev += " \
     ${QT6_INSTALL_LIBDIR}/metatypes \
     ${QT6_INSTALL_LIBDIR}/pkgconfig \
     ${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,6 +115,7 @@ 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*/ \
@@ -112,7 +123,8 @@ FILES_${PN}-staticdev += " \
 "
 
 # Note: INSTALL_EXAMPLESDIR is not used
-FILES_${PN}-examples = " \
+FILES:${PN}-examples = " \
     ${QT6_INSTALL_EXAMPLESDIR} \
     ${prefix}/examples \
 "
+RDEPENDS:${PN}-examples = "${PN}"

recipes-qt/qt6/qtapplicationmanager_git.bb

@@ -0,0 +1,22 @@
+DESCRIPTION = "Qt component for application lifecycle management"
+LICENSE = "(GFDL-1.3 & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0-only | GPL-2.0-or-later)) | The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
+
+inherit qt6-cmake
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
+include recipes-qt/qt6/qt6.inc
+
+DEPENDS += "qtbase qtdeclarative libyaml libarchive qtapplicationmanager-native"
+RDEPENDS:${PN}:class-target = "libcrypto ${PN}-tools"
+
+PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'multi-process', '', d)}"
+
+PACKAGECONFIG[tools-only] = "-DFEATURE_am_tools_only=ON, -DFEATURE_am_tools_only=OFF"
+PACKAGECONFIG[multi-process] = "-DFEATURE_am_multi_process=ON, -DFEATURE_am_multi_process=OFF, qtwayland qtwayland-native"
+
+PACKAGECONFIG:class-native ??= "tools-only"
+PACKAGECONFIG:class-nativesdk ??= "${PACKAGECONFIG:class-native}"
+
+BBCLASSEXTEND = "nativesdk native"

recipes-qt/qt6/qtbase/0003-tests-disable-failing-tests.patch

@@ -0,0 +1,37 @@
+From 54761cb9a05db79482cea138effc6d1c33125e99 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Wed, 8 Sep 2021 09:31:15 +0300
+Subject: [PATCH] tests: disable failing tests
+
+Some of the tests fail to link with gold linker used.
+
+Upstream-Status: Inappropriate [embedded specific]
+---
+ tests/auto/gui/image/CMakeLists.txt  | 2 +-
+ tests/auto/gui/math3d/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/auto/gui/image/CMakeLists.txt b/tests/auto/gui/image/CMakeLists.txt
+index 14930536c9..2a506aa089 100644
+--- a/tests/auto/gui/image/CMakeLists.txt
++++ b/tests/auto/gui/image/CMakeLists.txt
+@@ -6,7 +6,7 @@ if(TARGET Qt::Network AND NOT ANDROID)
+ endif()
+ add_subdirectory(qicoimageformat)
+ add_subdirectory(qpixmap)
+-add_subdirectory(qimage)
++#add_subdirectory(qimage)
+ add_subdirectory(qimageiohandler)
+ add_subdirectory(qimagewriter)
+ add_subdirectory(qmovie)
+diff --git a/tests/auto/gui/math3d/CMakeLists.txt b/tests/auto/gui/math3d/CMakeLists.txt
+index 11c50163ad..bc3ce532c8 100644
+--- a/tests/auto/gui/math3d/CMakeLists.txt
++++ b/tests/auto/gui/math3d/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ # Generated from math3d.pro.
+ 
+-add_subdirectory(qquaternion)
++#add_subdirectory(qquaternion)
+ add_subdirectory(qvectornd)
+ add_subdirectory(qmatrixnxn)

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

@@ -0,0 +1,47 @@
+From e3f59a24add346248842a8f28971621469c9161f 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
+
+Set initial host path based on the location of the qt.toolchain.cmake file.
+This helps us avoid need to relocate the file in SDK.
+
+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 | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/cmake/qt.toolchain.cmake.in b/cmake/qt.toolchain.cmake.in
+index c565e923ff..a917c65d89 100644
+--- a/cmake/qt.toolchain.cmake.in
++++ b/cmake/qt.toolchain.cmake.in
+@@ -70,8 +70,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.
+@@ -156,10 +156,10 @@ endif()
+ # Set up QT_HOST_PATH and do sanity checks.
+ # A host path is required when cross-compiling but optional when doing a native build.
+ set(__qt_toolchain_host_path_required "@qt_host_path_required@")
+-set(__qt_toolchain_initial_qt_host_path
+-    "@qt_host_path_absolute@")
+-set(__qt_toolchain_initial_qt_host_path_cmake_dir
+-    "@qt_host_path_cmake_dir_absolute@")
++get_filename_component(__qt_toolchain_initial_qt_host_path
++    "${CMAKE_CURRENT_LIST_DIR}/../../.." ABSOLUTE)
++get_filename_component(__qt_toolchain_initial_qt_host_path_cmake_dir
++    "${CMAKE_CURRENT_LIST_DIR}/../../../lib/cmake" ABSOLUTE)
+ 
+ # QT_HOST_PATH precedence:
+ # - cache variable / command line option

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

@@ -0,0 +1,28 @@
+From 07f7e1ae76b24ba64cd87726c438638a8fa3eba0 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Mon, 22 Aug 2022 15:01:28 +0300
+Subject: [PATCH] testlib: don't track the build or source directories
+
+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 03deb2edc9..972b366532 100644
+--- a/src/testlib/CMakeLists.txt
++++ b/src/testlib/CMakeLists.txt
+@@ -125,8 +125,8 @@ set(qt_tc_build_dir_def
+     "$<IF:${qt_bool_tc_build_dir},${qt_tc_build_dir},$<TARGET_PROPERTY:BINARY_DIR>>"
+ )
+ set_property(TARGET Test APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS
+-    QT_TESTCASE_BUILDDIR="${qt_tc_build_dir_def}"
+-    QT_TESTCASE_SOURCEDIR="$<TARGET_PROPERTY:SOURCE_DIR>"
++    QT_TESTCASE_BUILDDIR=""
++    QT_TESTCASE_SOURCEDIR=""
+ )
+ 
+ # special case begin

recipes-qt/qt6/qtbase_git.bb

@@ -1,31 +1,42 @@
-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 = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0-or-later | LGPL-3.0-only ) | The-Qt-Company-Commercial"
 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://LICENSE.QT-LICENSE-AGREEMENT;md5=485e1d58b313def058a0d72598aa6efe \
 "
 
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
+include recipes-qt/qt6/conan.inc
 
 SRC_URI += "\
     file://0001-Add-linux-oe-g-platform.patch \
     file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
+    file://0003-tests-disable-failing-tests.patch \
+    file://0004-Fix-qt.toolchain.cmake-for-SDK-use.patch \
+    file://0005-testlib-don-t-track-the-build-or-source-directories.patch \
 "
 
 DEPENDS += "\
     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:class-target = " locale-base-c"
+
+PACKAGECONFIG:class-native ?= "\
+    gui widgets jpeg png dbus no-opengl openssl zlib \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'zstd', '', d)} \
+"
+PACKAGECONFIG:class-nativesdk ?= "${PACKAGECONFIG:class-native}"
 PACKAGECONFIG ?= "\
     ${PACKAGECONFIG_DEFAULT} \
     ${PACKAGECONFIG_GRAPHICS} \
@@ -39,7 +50,7 @@ PACKAGECONFIG ?= "\
 PACKAGECONFIG_GRAPHICS ?= "\
     ${@bb.utils.filter('DISTRO_FEATURES', 'vulkan', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \
-        bb.utils.contains('DISTRO_FEATURES', 'x11', 'gl', 'gles2', d), 'no-opengl', d)} \
+        bb.utils.contains('DISTRO_FEATURES', 'x11', 'gl', 'gles2 eglfs', d), 'no-opengl linuxfb', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
 "
 PACKAGECONFIG_X11 ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb xkbcommon glib', '', d)}"
@@ -48,10 +59,13 @@ PACKAGECONFIG_FONTS ?= ""
 PACKAGECONFIG_SYSTEM ?= ""
 PACKAGECONFIG_DISTRO ?= ""
 PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev gui widgets icu openssl  \
-    jpeg png dbus libinput fontconfig harfbuzz \
+    jpeg png dbus libinput fontconfig harfbuzz zlib \
     ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'zstd', '', d)} \
 "
+
+PACKAGECONFIG:remove:mingw32 = "openssl"
+
 # Build type: Debug, Release, MinSizeRel, RelWithDebInfo
 BUILD_TYPE ?= "Release"
 # OpenSSL linking mode: runtime, linked
@@ -64,10 +78,12 @@ QT_QPA_DEFAULT_PLATFORM ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb'
 PACKAGECONFIG[ltcg] = "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON,-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=OFF"
 PACKAGECONFIG[optimize-size] = "-DFEATURE_optimize_size=ON,-DFEATURE_optimize_size=OFF"
 PACKAGECONFIG[static] = "-DBUILD_SHARED_LIBS=OFF,-DBUILD_SHARED_LIBS=ON"
+PACKAGECONFIG[developer-build] = "-DFEATURE_developer_build=ON,-DFEATURE_developer_build=OFF"
 
 PACKAGECONFIG[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
@@ -84,15 +100,17 @@ PACKAGECONFIG[fontconfig] = "-DFEATURE_fontconfig=ON,-DFEATURE_fontconfig=OFF,fo
 PACKAGECONFIG[gbm] = "-DFEATURE_gbm=ON,-DFEATURE_gbm=OFF,virtual/libgbm"
 PACKAGECONFIG[gl] = "-DFEATURE_opengl_desktop=ON,-DFEATURE_opengl_desktop=OFF,virtual/libgl"
 PACKAGECONFIG[gles2] = "-DFEATURE_opengles2=ON,-DFEATURE_opengles2=OFF,virtual/libgles2 virtual/egl"
+PACKAGECONFIG[eglfs] = "-DFEATURE_eglfs=ON,-DFEATURE_eglfs=OFF"
 PACKAGECONFIG[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[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[tslib] = "-DFEATURE_tslib=ON,-DFEATURE_tslib=OFF,tslib"
-PACKAGECONFIG[vulkan] = "-DFEATURE_vulkan=ON,-DFEATURE_vulkan=OFF,vulkan-headers vulkan-loader"
+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[xkbcommon] = "-DFEATURE_xkbcommon=ON,-DFEATURE_xkbcommon=OFF,libxkbcommon,xkeyboard-config"
 
@@ -109,26 +127,30 @@ 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 \
     -DQT_QPA_DEFAULT_PLATFORM=${QT_QPA_DEFAULT_PLATFORM} \
-    -DQT_AVOID_CMAKE_ARCHIVING_API=ON \
-    -DFEATURE_use_bfd_linker=ON \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-DFEATURE_use_gold_linker=ON', '-DFEATURE_use_bfd_linker=ON', d)} \
+"
+
+EXTRA_OECMAKE:append:mingw32 = "\
+    -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON \
 "
 
 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'
 
     # remove mac and android specific scripts that depend on perl and bash
@@ -137,17 +159,50 @@ do_install_append() {
     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
-}
 
-do_install_append_class-nativesdk() {
+    # 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
     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 "")
+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('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-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"
+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 +211,3 @@ INHIBIT_PACKAGE_STRIP_FILES = "\
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "9ef816e13a63c1932f3464119796bdbb07c7e893"

recipes-qt/qt6/qtcharts_git.bb

@@ -1,16 +1,18 @@
-LICENSE = "GPL-3.0 | The-Qt-Company-Commercial"
+LICENSE = "GFDL-1.3 & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+    file://LICENSE.FDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
 "
 
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
 PACKAGECONFIG ?= "qml"
-PACKAGECONFIG[qml] = ",,qtdeclarative"
+PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
 
-SRCREV = "282f9aa1a5ca6cf2c853f20018a8cd6671f2934f"

recipes-qt/qt6/qtcoap_git.bb

@@ -1,15 +1,17 @@
-LICENSE = "GFDL-1.3 & BSD & GPL-3.0 | The-Qt-Company-Commercial"
+LICENSE = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+    file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \
 "
 
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative"
+PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtdeclarative-native"
 
-SRCREV = "d2c1019b0cd5ef60aba81090fd5d19a8624028f3"

recipes-qt/qt6/qtconnectivity_git.bb

@@ -1,4 +1,4 @@
-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 = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0-or-later | LGPL-3.0-only ) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@@ -10,14 +10,14 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 # QTBUG-93565
 PTEST_ENABLED = "0"
 
-DEPENDS += "qtbase qtdeclarative"
+DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
 
 PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
 PACKAGECONFIG[bluez] = "-DFEATURE_bluez=ON,-DFEATURE_bluez=OFF,bluez5"
 
-SRCREV = "003ff2cb174747b7eee4f2e299bb72e629f202e2"

recipes-qt/qt6/qtdatavis3d_git.bb

@@ -1,13 +1,15 @@
-LICENSE = "GPL-3.0 | The-Qt-Company-Commercial"
+LICENSE = "GFDL-1.3 & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+    file://LICENSE.FDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
 "
 
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
-DEPENDS += "qtbase qtdeclarative"
+DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
 
-SRCREV = "e0713ad6f89eac8a4e7cbb5adfaf4daf6a91ca3c"

recipes-qt/qt6/qtdeclarative_git.bb

@@ -1,4 +1,4 @@
-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 = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0-or-later | LGPL-3.0-only ) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@@ -10,10 +10,10 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "7fa28f98824a94396106eadfc028b329985a0cfc"

recipes-qt/qt6/qtdeviceutilities_git.bb

@@ -1,11 +1,11 @@
-LICENSE = "GPL-3.0 | The-Qt-Company-Commercial"
+LICENSE = "GPL-3.0-only | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit qt6-cmake
 include recipes-qt/qt6/qt6.inc
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 
 DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtvirtualkeyboard"
-RDEPENDS_${PN} = "connman"
+RDEPENDS:${PN} = "connman"
 
-SRCREV = "10c59319e196f717e569a9a0bfc45ae73d88d1fd"

recipes-qt/qt6/qtimageformats_git.bb

@@ -1,19 +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 = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0-or-later | LGPL-3.0-only ) | The-Qt-Company-Commercial"
 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 \
 "
 
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
@@ -24,4 +21,3 @@ 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_git.bb

@@ -0,0 +1,17 @@
+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"
+
+# error: unexpected reloc 3 against global symbol qt_version_tag without base register
+# in object file when generating a position-independent output file
+QT_PTEST_ENABLED:x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '0', \
+    bb.utils.contains('DISTRO_FEATURES', 'ptest', '1', '0', d), d)}"

recipes-qt/qt6/qtinterfaceframework.inc

@@ -0,0 +1,35 @@
+inherit systemd
+
+SRC_URI += " \
+    file://ifmedia-simulation-server.service \
+    file://ifvehiclefunctions-simulation-server.service \
+    file://if-services.target \
+    file://simulation-server.conf \
+"
+
+do_install:append:class-target() {
+    install -m 0755 -d ${D}${systemd_unitdir}/system
+    install -m 0644 ${WORKDIR}/ifmedia-simulation-server.service ${D}${systemd_unitdir}/system/
+    install -m 0644 ${WORKDIR}/ifvehiclefunctions-simulation-server.service ${D}${systemd_unitdir}/system/
+    install -m 0644 ${WORKDIR}/if-services.target ${D}${systemd_unitdir}/system/
+
+    install -m 0755 -d ${D}${sysconfdir}
+    install -m 0755 ${WORKDIR}/simulation-server.conf ${D}${sysconfdir}/
+}
+
+SYSTEMD_PACKAGES = "${PN}-simulation"
+SYSTEMD_SERVICE:${PN}-simulation = " \
+    ifmedia-simulation-server.service \
+    ifvehiclefunctions-simulation-server.service \
+    if-services.target \
+    "
+
+PACKAGE_BEFORE_PN =+ "${PN}-simulation"
+FILES:${PN}-simulation = " \
+    ${QT6_INSTALL_BINDIR}/ifmedia-simulation-server \
+    ${QT6_INSTALL_BINDIR}/ifvehiclefunctions-simulation-server \
+    ${QT6_INSTALL_PLUGINSDIR}/interfaceframework/ \
+    ${systemd_unitdir}/system \
+    ${sysconfdir}/simulation-server.conf \
+    "
+RRECOMMENDS:${PN} += "${PN}-simulation"

recipes-qt/qt6/qtinterfaceframework/if-services.target

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

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

@@ -0,0 +1,13 @@
+[Unit]
+Description=ifmedia-simulation-server
+PartOf=if-services.target
+Before=if-services.target
+
+[Service]
+User=root
+ExecStart=/usr/bin/ifmedia-simulation-server
+Restart=on-failure
+Environment=SERVER_CONF_PATH=/etc/simulation-server.conf
+
+[Install]
+WantedBy=if-services.target

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

@@ -0,0 +1,13 @@
+[Unit]
+Description=ifvehiclefunctions-simulation-server
+PartOf=if-services.target
+Before=if-services.target
+
+[Service]
+User=root
+ExecStart=/usr/bin/ifvehiclefunctions-simulation-server
+Restart=on-failure
+Environment=SERVER_CONF_PATH=/etc/simulation-server.conf
+
+[Install]
+WantedBy=if-services.target

recipes-qt/qt6/qtinterfaceframework/simulation-server.conf

@@ -0,0 +1,8 @@
+[remotesettings]
+Registry=tcp://0.0.0.0:9999
+
+[drivedata]
+Registry=tcp://0.0.0.0:9998
+
+[qtifmedia]
+Registry=tcp://0.0.0.0:9997

recipes-qt/qt6/qtinterfaceframework_git.bb

@@ -0,0 +1,76 @@
+DESCRIPTION = "Qt Interface Framework"
+LICENSE = "(GFDL-1.3 & BSD-3-Clause & The-Qt-Company-GPL-Exception-1.0 & (LGPL-3.0-only | GPL-2.0-or-later)) | The-Qt-Company-Commercial"
+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 \
+"
+
+inherit qt6-cmake
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
+include recipes-qt/qt6/qt6.inc
+
+python() {
+    if 'meta-python' not in d.getVar('BBFILE_COLLECTIONS').split():
+        raise bb.parse.SkipRecipe('Requires meta-python to be present.')
+}
+
+# Default build and package these
+REFERENCE_API ?= "1"
+SIMULATION_SUPPORT ?= "1"
+include ${@bb.utils.contains('SIMULATION_SUPPORT', '1', 'qtinterfaceframework.inc', '', d)}
+
+FILES:${PN}-dev += " \
+    ${QT6_INSTALL_DATADIR}/ifcodegen-templates \
+    "
+
+PACKAGE_BEFORE_PN =+ "${PN}-refapi-media"
+FILES:${PN}-refapi-media = "\
+    ${QT6_INSTALL_LIBDIR}/libQt6IfMedia.so.* \
+    ${QT6_INSTALL_LIBDIR}/qml/QtInterfaceFramework/Media \
+    "
+
+PACKAGE_BEFORE_PN =+ "${PN}-refapi-vehiclefuntions"
+FILES:${PN}-refapi-vehiclefuntions = "\
+    ${QT6_INSTALL_LIBDIR}/libQt6IfVehicleFunctions.so.* \
+    ${QT6_INSTALL_LIBDIR}/qml/QtInterfaceFramework/VehicleFunctions \
+    "
+
+DEPENDS += "qtbase qtinterfaceframework-native"
+
+PRIVATE_LIBS:${PN}-examples = "libInstrumentCluster.so"
+
+PACKAGECONFIG ?= "ifcodegen remoteobjects interfaceframework \
+    ${PACKAGECONFIG_REFERENCE_API} \
+    ${PACKAGECONFIG_SIMULATION} \
+    "
+
+PACKAGECONFIG[taglib] = "-DFEATURE_taglib=ON,-DFEATURE_taglib=OFF,taglib"
+PACKAGECONFIG[host-tools-only] = "-DFEATURE_host_tools_only=ON,-DFEATURE_host_tools_only=OFF"
+PACKAGECONFIG[ifcodegen] = "-DFEATURE_ifcodegen=ON,-DFEATURE_ifcodegen=OFF,python3-qface,python3-qface"
+PACKAGECONFIG[remoteobjects] = "-DFEATURE_remoteobjects=ON,-DFEATURE_remoteobjects=OFF,qtremoteobjects qtremoteobjects-native"
+
+#interfaceframework only
+PACKAGECONFIG[interfaceframework] = "-DFEATURE_interfaceframework=ON,-DFEATURE_interfaceframework=OFF"
+
+# reference API's
+PACKAGECONFIG[ifmedia] = "-DFEATURE_ifmedia=ON,-DFEATURE_ifmedia=OFF, qtmultimedia qtdeclarative"
+PACKAGECONFIG[ifvehiclefunctions] = "-DFEATURE_ifvehiclefunctions=ON,-DFEATURE_ifvehiclefunctions=OFF, qtdeclarative"
+
+PACKAGECONFIG_REFERENCE_API ?= "${@bb.utils.contains('REFERENCE_API', '1', 'ifvehiclefunctions ifmedia taglib', '', d)}"
+
+# simulation support
+PACKAGECONFIG[no-media-simulation] = "-DFEATURE_media_qtro_backend=OFF -DFEATURE_media_qtro_simulation_server=OFF -DFEATURE_media_simulation_backend=OFF -DFEATURE_tuner_simulation_backend=OFF"
+PACKAGECONFIG[no-vehiclefuntions-simulation] = "-DFEATURE_vehiclefunctions_qtro_backend=OFF -DFEATURE_vehiclefunctions_qtro_simulation_server=OFF -DFEATURE_vehiclefunctions_simulation_backend=OFF"
+
+PACKAGECONFIG_SIMULATION ?= "${@bb.utils.contains('SIMULATION_SUPPORT', '1', '', 'no-media-simulation no-vehiclefuntions-simulation', d)}"
+
+PACKAGECONFIG:class-native ??= "interfaceframework ifcodegen host-tools-only remoteobjects"
+PACKAGECONFIG:class-nativesdk ??= "${PACKAGECONFIG:class-native}"
+
+BBCLASSEXTEND = "native nativesdk"
+

recipes-qt/qt6/qtlottie_git.bb

@@ -1,14 +1,15 @@
-LICENSE = "(GPL-3.0 & The-Qt-Company-GPL-Exception-1.0) | The-Qt-Company-Commercial"
+LICENSE = "GFDL-1.3 & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+    file://LICENSE.FDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
 "
 
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
-DEPENDS += "qtbase qtdeclarative"
+DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
 
-SRCREV = "6748a346438abc5f43bde3a0de33c0ee51f33f32"

recipes-qt/qt6/qtmqtt_git.bb

@@ -1,16 +1,17 @@
-LICENSE = "(GPL-3.0 & The-Qt-Company-GPL-Exception-1.0) | The-Qt-Company-Commercial"
+LICENSE = "GFDL-1.3 & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+    file://LICENSE.FDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
 "
 
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets"
+PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtdeclarative-native qtwebsockets"
 
-SRCREV = "e22417694d294c539120d8684d71d95a81bd2b40"

recipes-qt/qt6/qtmultimedia_git.bb

@@ -1,4 +1,4 @@
-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 = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0-or-later | LGPL-3.0-only ) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@@ -10,16 +10,17 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtshadertools qtshadertools-native"
 
 PACKAGECONFIG ?= "gstreamer qml"
 PACKAGECONFIG[alsa] = "-DFEATURE_alsa=ON,-DFEATURE_alsa=OFF,alsa-lib"
+PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtsvg"
 PACKAGECONFIG[pulseaudio] = "-DFEATURE_pulseaudio=ON,-DFEATURE_pulseaudio=OFF,pulseaudio"
 PACKAGECONFIG[gstreamer] = "-DFEATURE_gstreamer=ON,-DFEATURE_gstreamer=OFF,gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
-PACKAGECONFIG[qml] = ",,qtdeclarative"
+PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
 
 EXTRA_OECMAKE += "-DFEATURE_gpu_vivante=OFF"
 
-SRCREV = "7d3e538096384ce996ec948068f8e7efa52e0868"

recipes-qt/qt6/qtnetworkauth_git.bb

@@ -1,4 +1,4 @@
-LICENSE = "BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial"
+LICENSE = "BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
@@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-SRCREV = "5d840b0955aef9a46f44a8a0786e6026f8012ae3"

recipes-qt/qt6/qtopcua_git.bb

@@ -1,5 +1,9 @@
-LICENSE = "( GFDL-1.3 & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial ) & MPL-2.0 & CC0-1.0"
+LICENSE = "( GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0-or-later | LGPL-3.0-only ) | The-Qt-Company-Commercial ) & MPL-2.0 & CC0-1.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=f70ee9a6c44ae8917586fea34dff0ab5 \
     file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
     file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \
@@ -8,11 +12,11 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 PACKAGECONFIG ?= "qml"
-PACKAGECONFIG[qml] = ",,qtdeclarative"
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,,qtquickcontrols2"
+PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
 
 # src/3rdparty/open62541.pri adds -Wno-format, causing following error
 # because -Wformat-security cannot be used together with -Wno-format
@@ -21,4 +25,3 @@ SECURITY_STRINGFORMAT = ""
 
 DEPENDS += "qtbase"
 
-SRCREV = "4bf3a4f645e721fce6a4471bde8eed884319cccf"

recipes-qt/qt6/qtpositioning_git.bb

@@ -1,26 +1,25 @@
-LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial )"
+LICENSE = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( GPL-2.0-or-later | LGPL-3.0-only | The-Qt-Company-Commercial )"
 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.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
+    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
 "
 
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
-QT_MODULE = "qtlocation"
-
 DEPENDS += "qtbase"
 
 PACKAGECONFIG ?= "nmea qml"
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative,qtquickcontrols2"
 PACKAGECONFIG[geoclue] = ",,,geoclue"
 PACKAGECONFIG[gypsy] = "-DFEATURE_gypsy=ON,-DFEATURE_gypsy=OFF,gconf gypsy"
 PACKAGECONFIG[nmea] = ",,qtserialport"
-PACKAGECONFIG[qml] = ",,qtdeclarative"
+PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
 
-SRCREV = "b201ceaedcf39e988a25bc16deed2fe095a1f93e"

recipes-qt/qt6/qtquick3d_git.bb

@@ -1,30 +1,33 @@
-LICENSE = "BSD-3-Clause & ( GFDL-1.3 & BSD & GPL-3.0 | The-Qt-Company-Commercial )"
+LICENSE = "BSD-3-Clause & ( GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial )"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+    file://LICENSE.FDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
     file://src/3rdparty/assimp/src/LICENSE;md5=d9d5275cab4fb13ae624d42ce64865de \
 "
 
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 ASSIMP_BRANCH = "qt6_assimp"
 
 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=qtquick3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \
 "
 
 DEPENDS = "qtbase qtdeclarative qtshadertools qtshadertools-native qtquick3d-native"
 
 BBCLASSEXTEND = "native nativesdk"
 
+PACKAGECONFIG:class-target ?= "qtquicktimeline"
+PACKAGECONFIG[qtquicktimeline] = ",,qtquicktimeline"
 PACKAGECONFIG[system-assimp] = "-DFEATURE_system_assimp=ON,-DFEATURE_system_assimp=OFF,assimp"
 
-FILES_${PN}-qmlplugins += " \
+FILES:${PN}-qmlplugins += " \
   ${QT6_INSTALL_QMLDIR}/QtQuick3D/Helpers/meshes/*.mesh \
 "
 
-SRCREV_FORMAT = "qtquick3d_assimp"
-SRCREV_qtquick3d = "7c817ba5423e98af3635c3b6a3d5741379bcd796"
-SRCREV_assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
+SRCREV_FORMAT = "qtquick3d_qtquick3d-assimp"

recipes-qt/qt6/qtquickcontrols2_git.bb

@@ -1,15 +0,0 @@
-LICENSE = "GFDL-1.3 & BSD & ( LGPL-3.0 | GPL-3.0 ) | The-Qt-Company-Commercial"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-    file://LICENSE.LGPLv3;md5=382747d0119037529ec2b98b24038eb0 \
-    file://LICENSE.GPLv3;md5=dce746aa5261707df6d6999ab9958d8b \
-"
-
-inherit qt6-cmake
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6.inc
-
-DEPENDS = "qtbase qtdeclarative"
-
-SRCREV = "fb6baf03faf1ffdda5917b9daa9e9ed0f821fa8a"

recipes-qt/qt6/qtquickdesigner-components_git.bb

@@ -1,9 +1,9 @@
-LICENSE = "GPL-3.0 | The-Qt-Company-Commercial"
+LICENSE = "GPL-3.0-only | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
 "
 
-inherit qt6-qmake
+inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
 include recipes-qt/qt6/qt6.inc
@@ -11,6 +11,5 @@ include recipes-qt/qt6/qt6.inc
 QT_GIT_PROJECT = "qt-labs"
 QT_MODULE_BRANCH = "dev"
 
-DEPENDS += "qtbase qtdeclarative qtquickcontrols2"
+DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
 
-SRCREV = "7524cdb4d7ffae0efdd8b6f7122e5d755ed9816b"

recipes-qt/qt6/qtquicktimeline_git.bb

@@ -1,14 +1,15 @@
-LICENSE = "GPL-2.0+ | The-Qt-Company-Commercial"
+LICENSE = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
-    "
+    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+    file://LICENSE.FDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
+"
 
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
-DEPENDS = "qtbase qtdeclarative"
+DEPENDS = "qtbase qtdeclarative qtdeclarative-native"
 
-SRCREV = "c5a22d0b92856bf975d01296444c4cd2aef878b3"

recipes-qt/qt6/qtremoteobjects_git.bb

@@ -1,18 +1,19 @@
-LICENSE = "BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0+ | LGPL-3.0 ) | The-Qt-Company-Commercial"
+LICENSE = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0-or-later | LGPL-3.0-only ) | The-Qt-Company-Commercial"
 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.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSE.FDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
 "
 
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtdeclarative qtremoteobjects-native"
 
-SRCREV = "dfba0948911aecd5723c04b0bd80af19ad95bea0"
 
 BBCLASSEXTEND += "native nativesdk"

recipes-qt/qt6/qtscxml_git.bb

@@ -1,6 +1,8 @@
-LICENSE = "LGPL-3.0 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial"
+LICENSE = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0-or-later | LGPL-3.0-only ) | The-Qt-Company-Commercial"
 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 \
 "
@@ -8,6 +10,7 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qtscxml-native"
@@ -17,4 +20,3 @@ PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "805eb53f97b0eb3ee71ada360c56cca10dc827bf"

recipes-qt/qt6/qtsensors_git.bb

@@ -1,4 +1,4 @@
-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 = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0-or-later | LGPL-3.0-only ) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
-DEPENDS += "qtbase qtdeclarative"
+DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
 
-SRCREV = "ae82c50ca7fd5e356a736467e660acd976ec2e25"

recipes-qt/qt6/qtserialbus_git.bb

@@ -1,4 +1,4 @@
-LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0+) | The-Qt-Company-Commercial"
+LICENSE = "GFDL-1.3 & (LGPL-3.0-only | GPL-2.0-or-later) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
     file://LICENSE.GPLv2;md5=c96076271561b0e3785dad260634eaa8 \
@@ -9,10 +9,16 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
-DEPENDS += "qtbase qtserialport qtserialbus-native"
+DEPENDS += "qtbase"
 
-BBCLASSEXTEND = "native nativesdk"
+PACKAGECONFIG ?= "modbus-serialport \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'socketcan', '', d)} \
+"
+PACKAGECONFIG:class-native = ""
+PACKAGECONFIG:class-nativesdk = ""
 
-SRCREV = "60b78e570bbd4645eb490391c53121a55a5d0e34"
+PACKAGECONFIG[modbus-serialport] = "-DFEATURE_modbus_serialport=ON,-DFEATURE_modbus_serialport=OFF,qtserialport"
+PACKAGECONFIG[socketcan] = "-DFEATURE_socketcan=ON,-DFEATURE_socketcan=OFF,,libsocketcan"

recipes-qt/qt6/qtserialport_git.bb

@@ -1,4 +1,4 @@
-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 = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0-or-later | LGPL-3.0-only ) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@@ -10,10 +10,10 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "7f1f85a0f1e3a74d092dbe8fe87d0ef4291c985b"

recipes-qt/qt6/qtshadertools_git.bb

@@ -1,4 +1,4 @@
-LICENSE = "GFDL-1.3 & BSD & GPL-3.0 | The-Qt-Company-Commercial"
+LICENSE = "GFDL-1.3 & BSD-3-Clause & GPL-3.0-only | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
 "
@@ -6,10 +6,14 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS = "qtbase qtshadertools-native"
+DEPENDS:append:class-native = " spirv-tools-native"
+
+RDEPENDS:${PN}-tools = "spirv-tools"
+RDEPENDS:${PN}-tools:remove:mingw32 = "spirv-tools"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "efa8993718f90775aa6097ab1f0fd3cd5ed1ac91"

recipes-qt/qt6/qtspeech_git.bb

@@ -1,16 +0,0 @@
-LICENSE = "GFDL-1.3 & (LGPL-3.0 | GPL-2.0+) | The-Qt-Company-Commercial"
-LIC_FILES_CHKSUM = " \
-    file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-    file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \
-    file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \
-"
-
-inherit qt6-qmake
-
-
-include recipes-qt/qt6/qt6-git.inc
-include recipes-qt/qt6/qt6.inc
-
-DEPENDS += "qtbase"
-
-SRCREV = "462c3384467cec55a31fde11afb959321063a0ce"

recipes-qt/qt6/qtsvg_git.bb

@@ -1,16 +1,17 @@
-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 = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0-or-later | LGPL-3.0-only ) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
-    file://LICENSE.LGPLv21;md5=4bfd28363f541b10d9f024181b8df516 \
-    file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \
-    file://LICENSE.GPLv3;md5=88e2b9117e6be406b5ed6ee4ca99a705 \
+    file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+    file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
 "
 
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-SRCREV = "05bfdf690620cc1629088a6e0f77c9ff1c8bf7ca"

recipes-qt/qt6/qttools_git.bb

@@ -1,4 +1,4 @@
-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 = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0-or-later | LGPL-3.0-only ) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@@ -10,21 +10,20 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 SRC_URI += " \
-    ${QT_GIT}/playground/qlitehtml.git;name=qlitehtml;branch=master;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/assistant/qlitehtml \
-    git://github.com/litehtml/litehtml.git;name=litehtml;branch=master;destsuffix=git/src/assistant/qlitehtml/src/3rdparty/litehtml \
+    ${QT_GIT}/playground/qlitehtml.git;name=qttools-qlitehtml;branch=master;protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/assistant/qlitehtml \
+    git://github.com/litehtml/litehtml.git;name=qttools-qlitehtml-litehtml;branch=master;destsuffix=git/src/assistant/qlitehtml/src/3rdparty/litehtml;protocol=https \
 "
 
 DEPENDS += "qtbase qtdeclarative qttools-native"
 
-FILES_${PN}-tools += "${QT6_INSTALL_DATADIR}/phrasebooks"
+PACKAGECONFIG[clang] = "-DFEATURE_clang=ON,-DFEATURE_clang=OFF,clang"
+
+FILES:${PN}-tools += "${QT6_INSTALL_DATADIR}/phrasebooks"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV_FORMAT = "qttools_qlitehtml_litehtml"
-
-SRCREV_qttools = "528c81e88dd8d5070ea814ed124f89ce802fe3ad"
-SRCREV_qlitehtml = "908670c5b68d3bcf4712019a028079b8b2042dd4"
-SRCREV_litehtml = "2c033bff0ba2d93e5d58303523800d03c21903d4"
+SRCREV_FORMAT = "qttools_qttools-qlitehtml_qttools-qlitehtml-litehtml"

recipes-qt/qt6/qttranslations_git.bb

@@ -1,4 +1,4 @@
-LICENSE = "GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial"
+LICENSE = "GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
 "
@@ -6,13 +6,14 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase qttools qttools-native"
 
 PACKAGES = "${PN}"
 PACKAGES_DYNAMIC = "${PN}-*"
-PACKAGESPLITFUNCS_prepend = "split_translation_packages "
+PACKAGESPLITFUNCS:prepend = "split_translation_packages "
 
 python split_translation_packages () {
     do_split_packages(d, d.expand('${QT6_INSTALL_TRANSLATIONSDIR}'),
@@ -22,7 +23,6 @@ python split_translation_packages () {
     # Add dynamic packages to the rrecommends of the main packages
     pn = d.getVar('PN')
     pkgs = oe.utils.packages_filter_out_system(d)
-    d.setVar('RRECOMMENDS_' + pn, ' '.join(pkgs))
+    d.setVar('RRECOMMENDS:' + pn, ' '.join(pkgs))
 }
 
-SRCREV = "3d20d9e51b6f8b3dc3c41448866acc20dae7e54e"

recipes-qt/qt6/qtvirtualkeyboard_git.bb

@@ -1,11 +1,14 @@
-LICENSE = "GPL-3.0 | The-Qt-Company-Commercial"
+LICENSE = "GFDL-1.3 & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
+    file://LICENSE.FDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
 "
 
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 # To enabled Nuance T9 Write support, you need to provide the licensed components
@@ -62,7 +65,6 @@ VKB_LANGUAGES ?= "\
 
 PACKAGECONFIG ?= "${VKB_LANGUAGES} ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'desktop', '', d)}"
 
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtquickcontrols2"
 PACKAGECONFIG[desktop] = "-DFEATURE_vkb_desktop=ON,-DFEATURE_vkb_desktop=OFF"
 PACKAGECONFIG[arrow-keynavigation] = "-DFEATURE_vkb_arrow_keynavigation=ON,-DFEATURE_vkb_arrow_keynavigation=OFF"
 PACKAGECONFIG[hunspell] = "-DFEATURE_hunspell=ON,-DFEATURE_hunspell=OFF,hunspell"
@@ -111,9 +113,8 @@ PACKAGECONFIG[lang-zh_CN] = "-DFEATURE_vkb_lang_zh_CN=ON,-DFEATURE_vkb_lang_zh_C
 PACKAGECONFIG[lang-zh_TW] = "-DFEATURE_vkb_lang_zh_TW=ON,-DFEATURE_vkb_lang_zh_TW=OFF"
 
 PACKAGES += "${PN}-dictionaries"
-RRECOMMENDS_${PN} += "${PN}-dictionaries"
-FILES_${PN}-dictionaries = "${QT6_INSTALL_DATADIR}/qtvirtualkeyboard/*/*.dat"
+RRECOMMENDS:${PN} += "${PN}-dictionaries"
+FILES:${PN}-dictionaries = "${QT6_INSTALL_DATADIR}/qtvirtualkeyboard/*/*.dat"
 
 DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native"
 
-SRCREV = "63a944ff12580f2c333a162ecaecd12419a39c10"

recipes-qt/qt6/qtwayland_git.bb

@@ -1,4 +1,4 @@
-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 = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0-or-later | LGPL-3.0-only ) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 SRC_URI +="\
@@ -19,17 +20,13 @@ SRC_URI +="\
 PACKAGECONFIG ?= "\
     wayland-client \
     wayland-server \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcomposite-glx', '', d)} \
 "
-PACKAGECONFIG_class-native ?= ""
-PACKAGECONFIG_class-nativesdk ?= ""
+PACKAGECONFIG:class-native ?= ""
+PACKAGECONFIG:class-nativesdk ?= ""
 
 PACKAGECONFIG[wayland-client] = "-DFEATURE_wayland_client=ON,-DFEATURE_wayland_client=OFF,"
 PACKAGECONFIG[wayland-server] = "-DFEATURE_wayland_server=ON,-DFEATURE_wayland_server=OFF,"
 
-PACKAGECONFIG[xcomposite-egl] = "-DFEATURE_xcomposite_egl=ON,-DFEATURE_xcomposite_egl=OFF,libxcomposite"
-PACKAGECONFIG[xcomposite-glx] = "-DFEATURE_xcomposite_glx=ON,-DFEATURE_xcomposite_glx=OFF,libxcomposite virtual/mesa"
-
 PACKAGECONFIG[dmabuf-client-buffer] = "-DFEATURE_wayland_dmabuf_client_buffer=ON,-DFEATURE_wayland_dmabuf_client_buffer=OFF,libdrm"
 PACKAGECONFIG[dmabuf-server-buffer] = "-DFEATURE_wayland_dmabuf_server_buffer=ON,-DFEATURE_wayland_dmabuf_server_buffer=OFF,libdrm"
 
@@ -37,4 +34,3 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRCREV = "e2df5571613f09248d26c57ccab19f85286ab6d1"

recipes-qt/qt6/qtwebchannel_git.bb

@@ -1,4 +1,4 @@
-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 = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0-or-later | LGPL-3.0-only ) | The-Qt-Company-Commercial"
 LIC_FILES_CHKSUM = " \
     file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
     file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
@@ -10,12 +10,12 @@ LIC_FILES_CHKSUM = " \
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
 PACKAGECONFIG ?= "qml"
-PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets"
-PACKAGECONFIG[qml] = ",,qtdeclarative"
+PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtwebsockets"
+PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native"
 
-SRCREV = "2daa001e1e9b1dc50a28e6ac20b1eb900e8b68d6"

recipes-qt/qt6/qtwebengine.inc

@@ -0,0 +1,42 @@
+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/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://LICENSE.Chromium;md5=d64fde5d347c3a68afe70f5e2e31fe83 \
+"
+
+inherit qt6-cmake
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
+include recipes-qt/qt6/qt6.inc
+
+inherit gettext
+inherit perlnative
+inherit python3native
+
+# we don't want gettext.bbclass to append --enable-nls
+def gettext_oeconf(d):
+    return ""
+
+QT_MODULE = "qtwebengine"
+QT_MODULE_BRANCH_CHROMIUM = "108-based"
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/qtwebengine:"
+
+SRC_URI += " \
+    ${QT_GIT}/${QT_GIT_PROJECT}/qtwebengine-chromium.git;name=qtwebengine-chromium;branch=${QT_MODULE_BRANCH_CHROMIUM};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty \
+    file://0001-CMake-use-generated-yocto-toolchains.patch \
+    file://0002-Enable-examples.patch \
+"
+
+SRC_URI += " \
+    file://chromium/0001-v8-qemu-wrapper.patch;patchdir=src/3rdparty \
+    file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \
+"
+
+SRCREV_FORMAT = "qtwebengine_qtwebengine-chromium"

recipes-qt/qt6/qtwebengine/0001-CMake-use-generated-yocto-toolchains.patch

@@ -0,0 +1,63 @@
+From c480cd09ed0297975f533c538faf26c7d4fcbe48 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Wed, 18 Aug 2021 15:09:41 +0300
+Subject: [PATCH] CMake: use generated yocto toolchains
+
+Bitbake knows how to generate working toolchains, use those instead of
+ones done by webengine. No need to use separate host pkg-wrapper with
+these toolchain. No need to do separate host build, we'll use the
+target binaries where needed.
+
+Upstream-Status: Inappropriate [embedded specific]
+Change-Id: I217c9122144f25bb2d28717e7248c2a51b149127
+---
+ cmake/Functions.cmake | 12 +++++-------
+ src/CMakeLists.txt    |  2 +-
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
+index b460dbbe8..98db2e52e 100644
+--- a/cmake/Functions.cmake
++++ b/cmake/Functions.cmake
+@@ -819,7 +819,7 @@ endfunction()
+ 
+ macro(create_pkg_config_host_wrapper buildDir)
+     find_package(PkgConfigHost)
+-        if(CMAKE_CROSSCOMPILING)
++        if(FALSE)
+             create_pkg_config_wrapper("${buildDir}/pkg-config-host_wrapper.sh" "${PKG_CONFIG_HOST_EXECUTABLE}")
+             set(PKG_CONFIG_HOST_EXECUTABLE "${buildDir}/pkg-config-host_wrapper.sh")
+         endif()
+@@ -1055,15 +1055,13 @@ endmacro()
+ macro(append_toolchain_setup)
+     if(LINUX)
+         list(APPEND gnArgArg
+-            custom_toolchain="${buildDir}/target_toolchain:target"
+-            host_toolchain="${buildDir}/host_toolchain:host"
++            custom_toolchain="//build/toolchain/yocto:yocto_target"
++            host_toolchain="//build/toolchain/yocto:yocto_native"
++            v8_snapshot_toolchain="//build/toolchain/yocto:yocto_target"
+         )
+         get_gn_arch(cpu ${TEST_architecture_arch})
+         if(CMAKE_CROSSCOMPILING)
+-            list(APPEND gnArgArg
+-                v8_snapshot_toolchain="${buildDir}/v8_toolchain:v8"
+-                target_cpu="${cpu}"
+-            )
++            list(APPEND gnArgArg target_cpu="${cpu}")
+         else()
+             list(APPEND gnArgArg host_cpu="${cpu}")
+         endif()
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index a62252783..3b7e4975f 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -157,7 +157,7 @@ endif()
+ #  HOST PROJECT
+ ##
+ 
+-if(CMAKE_CROSSCOMPILING AND NOT IOS AND NOT MACOS)
++if(FALSE)
+ 
+     if(NOT Gn_FOUND)
+         message(FATAL_ERROR "\nHost gn not found - cross compilation not possible")

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

@@ -0,0 +1,25 @@
+From 221aefe4d8777f45955cb100dfc4c7204c885a19 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Tue, 31 Aug 2021 18:27:48 +0300
+Subject: [PATCH] Enable examples
+
+The bug mentioned does not affect bitbake builds.
+
+Change-Id: I076763d9241061f9cdb4d46bcd88e46bd4f783aa
+---
+ examples/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index ccad90e11..32cd6d69d 100644
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ cmake_minimum_required(VERSION 3.16)
+ 
+ qt_examples_build_begin(EXTERNAL_BUILD)
+-if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533
++if(TRUE) #QTBUG-86533
+     if(TARGET Qt::WebEngineCore)
+         add_subdirectory(webenginequick)
+     endif()

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

@@ -0,0 +1,65 @@
+From 23d02fd87c766b6aef2a5aa81186b3db3f13b82a Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Date: Tue, 7 Nov 2017 15:24:32 +0100
+Subject: [PATCH] v8: qemu wrapper
+
+The patch below makes the V8 binaries run during the build be invoked through
+QEMU, as they are built for the target.
+
+Upstream-Status: Inappropriate [embedder specific]
+
+Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+Signed-off-by: Maksim Sisov <msisov@igalia.com>
+---
+ chromium/tools/v8_context_snapshot/BUILD.gn | 1 +
+ chromium/v8/BUILD.gn                        | 4 ++++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/chromium/tools/v8_context_snapshot/BUILD.gn b/chromium/tools/v8_context_snapshot/BUILD.gn
+index d868696dbf2..298273818ef 100644
+--- a/chromium/tools/v8_context_snapshot/BUILD.gn
++++ b/chromium/tools/v8_context_snapshot/BUILD.gn
+@@ -72,6 +72,7 @@ if (use_v8_context_snapshot) {
+       output_path = rebase_path(output_file, root_build_dir)
+ 
+       args = [
++        "../../../../v8-qemu-wrapper.sh",
+         "./" + rebase_path(get_label_info(":v8_context_snapshot_generator",
+                                           "root_out_dir") +
+                                "/v8_context_snapshot_generator",
+diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn
+index 2f99c3d70b0..9b28cf2ed4c 100644
+--- a/chromium/v8/BUILD.gn
++++ b/chromium/v8/BUILD.gn
+@@ -1870,6 +1870,7 @@ template("run_torque") {
+     }
+ 
+     args = [
++      "../../../../v8-qemu-wrapper.sh",
+       "./" + rebase_path(
+               get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
+               root_build_dir),
+@@ -2002,6 +2003,7 @@ action("generate_bytecode_builtins_list") {
+   outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ]
+   deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ]
+   args = [
++    "../../../../v8-qemu-wrapper.sh",
+     "./" + rebase_path(
+             get_label_info(
+                     ":bytecode_builtins_list_generator($v8_generator_toolchain)",
+@@ -2047,6 +2049,7 @@ template("run_mksnapshot") {
+     data = []
+ 
+     args = [
++      "../../../../v8-qemu-wrapper.sh",
+       "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
+                                         "root_out_dir") + "/mksnapshot",
+                          root_build_dir),
+@@ -5849,6 +5852,7 @@ if (v8_enable_i18n_support) {
+     outputs = [ output_file ]
+ 
+     args = [
++      "../../../../v8-qemu-wrapper.sh",
+       "./" + rebase_path(
+               get_label_info(
+                       ":gen-regexp-special-case($v8_generator_toolchain)",

recipes-qt/qt6/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch

@@ -0,0 +1,42 @@
+From 358e7b51c205521dc9eac8a8cf676412078fe014 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Thu, 30 Mar 2017 11:37:24 +0300
+Subject: [PATCH] chromium: workaround for too long .rps file name
+
+Ninja may fail when the build directory is too long:
+
+ninja: error: WriteFile(__third_party_WebKit_Source_bindings_modules_\
+interfaces_info_individual_modules__home_qt_work_build_build-nitrogen\
+6x_tmp_work_cortexa9hf-neon-mx6qdl-poky-linux-gnueabi_qtwebengine_5.9\
+.0_gitAUTOINC_29afdb0a34_049134677a-r0_build_src_toolchain_target__ru\
+le.rsp): Unable to create file. File name too long
+
+Task-number: QTBUG-59769
+Change-Id: I73c5e64ae5174412be2a675e35b0b6047f2bf4c1
+---
+ gn/src/gn/ninja_action_target_writer.cc | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/gn/src/gn/ninja_action_target_writer.cc b/gn/src/gn/ninja_action_target_writer.cc
+index 2ceac904a3c..8496e309cec 100644
+--- a/gn/src/gn/ninja_action_target_writer.cc
++++ b/gn/src/gn/ninja_action_target_writer.cc
+@@ -122,9 +122,18 @@ std::string NinjaActionTargetWriter::WriteRuleDefinition() {
+     // strictly necessary for regular one-shot actions, but it's easier to
+     // just always define unique_name.
+     std::string rspfile = custom_rule_name;
++
++    //quick workaround if filename length > 255 - ".rsp", just cut the dirs starting from the end
++    //please note ".$unique_name" is not used at the moment
++    int pos = 0;
++    std::string delimiter("_");
++    while (rspfile.length() > 250 && (pos = rspfile.find_last_of(delimiter)) != std::string::npos)
++        rspfile = rspfile.substr(0,pos);
++
+     if (!target_->sources().empty())
+       rspfile += ".$unique_name";
+     rspfile += ".rsp";
++
+     out_ << "  rspfile = " << rspfile << std::endl;
+ 
+     // Response file contents.

recipes-qt/qt6/qtwebengine_git.bb

@@ -0,0 +1,85 @@
+require recipes-qt/qt6/qtwebengine.inc
+require recipes-qt/qt6/chromium-gn.inc
+
+DEPENDS += " \
+    nodejs-native \
+    gperf-native \
+    bison-native \
+    qemu-native \
+    nss nss-native \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcomposite libxcursor libxi libxrandr libxtst libxkbfile', '', d)} \
+    qtbase qtdeclarative qtdeclarative-native \
+    gn-native \
+    python3-html5lib-native \
+"
+
+EXTRA_OECMAKE += "\
+    -DFEATURE_qtwebengine_build=ON \
+    -DFEATURE_qtpdf_build=OFF \
+"
+
+# chromium/third_party/openh264/BUILD.gn add -Wno-format to cflags
+# causing following error, because -Wformat-security cannot be used together with -Wno-format
+# cc1plus: error: -Wformat-security ignored without -Wformat [-Werror=format-security]
+# http://errors.yoctoproject.org/Errors/Details/150333/
+SECURITY_STRINGFORMAT = ""
+
+PACKAGECONFIG ??= "\
+    ${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \
+    glib \
+    libevent \
+    libjpeg \
+    libpci \
+    libpng \
+    libwebp \
+    zlib \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', '${PACKAGECONFIG_OPENEMBEDDED}', '', d)} \
+    geolocation \
+    webchannel \
+    printing-and-pdf \
+    pepper-plugins \
+    spellchecker \
+"
+PACKAGECONFIG_OPENEMBEDDED ?= "\
+    lcms2 \
+    opus \
+    snappy \
+    webrtc \
+"
+
+PACKAGECONFIG[alsa] = "-DFEATURE_webengine_system_alsa=ON,-DFEATURE_webengine_system_alsa=OFF,alsa-lib"
+PACKAGECONFIG[ffmpeg] = "-DFEATURE_webengine_system_ffmpeg=ON,-DFEATURE_webengine_system_ffmpeg=OFF,libav"
+PACKAGECONFIG[freetype] = "-DFEATURE_webengine_system_freetype=ON,-DFEATURE_webengine_system_freetype=OFF,freetype"
+PACKAGECONFIG[geolocation] = "-DFEATURE_webengine_geolocation=ON,-DFEATURE_webengine_geolocation=OFF,qtpositioning"
+PACKAGECONFIG[glib] = "-DFEATURE_webengine_system_glib=ON,-DFEATURE_webengine_system_glib=OFF,glib-2.0"
+PACKAGECONFIG[harfbuzz] = "-DFEATURE_webengine_system_harfbuzz=ON,-DFEATURE_webengine_system_harfbuzz=OFF,harfbuzz"
+PACKAGECONFIG[icu] = "-DFEATURE_webengine_system_icu=ON,-DFEATURE_webengine_system_icu=OFF,icu"
+PACKAGECONFIG[lcms2] = "-DFEATURE_webengine_system_lcms2=ON,-DFEATURE_webengine_system_lcms2=OFF,lcms"
+PACKAGECONFIG[libevent] = "-DFEATURE_webengine_system_libevent=ON,-DFEATURE_webengine_system_libevent=OFF,libevent"
+PACKAGECONFIG[libjpeg] = "-DFEATURE_webengine_system_libjpeg=ON,-DFEATURE_webengine_system_libjpeg=OFF,jpeg"
+PACKAGECONFIG[libpng] = "-DFEATURE_webengine_system_libpng=ON,-DFEATURE_webengine_system_libpng=OFF,libpng"
+PACKAGECONFIG[libvpx] = "-DFEATURE_webengine_system_libvpx=ON,-DFEATURE_webengine_system_libvpx=OFF,libvpx"
+PACKAGECONFIG[libwebp] = "-DFEATURE_webengine_system_libwebp=ON,-DFEATURE_webengine_system_libwebp=OFF,libwebp"
+PACKAGECONFIG[libxml] = "-DFEATURE_webengine_system_libxml=ON,-DFEATURE_webengine_system_libxml=OFF,libxml2 libxslt"
+PACKAGECONFIG[opus] = "-DFEATURE_webengine_system_opus=ON,-DFEATURE_webengine_system_opus=OFF,libopus"
+PACKAGECONFIG[libpci] = "-DFEATURE_webengine_system_libpci=ON,-DFEATURE_webengine_system_libpci=OFF,pciutils"
+PACKAGECONFIG[pepper-plugins] = "-DFEATURE_webengine_pepper_plugins=ON,-DFEATURE_webengine_pepper_plugins=OFF"
+PACKAGECONFIG[printing-and-pdf] = "-DFEATURE_webengine_printing_and_pdf=ON,-DFEATURE_webengine_printing_and_pdf=OFF,cups"
+PACKAGECONFIG[proprietary-codecs] = "-DFEATURE_webengine_proprietary_codecs=ON,-DFEATURE_webengine_proprietary_codecs=OFF"
+PACKAGECONFIG[pulseaudio] = "-DFEATURE_webengine_system_pulseaudio=ON,-DFEATURE_webengine_system_pulseaudio=OFF,pulseaudio"
+PACKAGECONFIG[re2] = "-DFEATURE_webengine_system_re2=ON,-DFEATURE_webengine_system_re2=OFF,re2"
+PACKAGECONFIG[snappy] = "-DFEATURE_webengine_system_snappy=ON,-DFEATURE_webengine_system_snappy=OFF,snappy"
+PACKAGECONFIG[spellchecker] = "-DFEATURE_webengine_spellchecker=ON,-DFEATURE_webengine_spellchecker=OFF"
+PACKAGECONFIG[webchannel] = "-DFEATURE_webengine_webchannel=ON,-DFEATURE_webengine_webchannel=OFF,qtwebchannel"
+PACKAGECONFIG[webrtc] = "-DFEATURE_webengine_webrtc=ON,-DFEATURE_webengine_webrtc=OFF,libvpx"
+PACKAGECONFIG[webrtc-pipewire] = "-DFEATURE_webengine_webrtc_pipewire=ON,-DFEATURE_webengine_webrtc_pipewire=OFF,pipewire glib-2.0 libepoxy virtual/libgbm"
+PACKAGECONFIG[zlib] = "-DFEATURE_webengine_system_zlib=ON -DFEATURE_webengine_system_minizip=ON,-DFEATURE_webengine_system_zlib=OFF -DFEATURE_webengine_system_minizip,zlib minizip"
+
+FILES:${PN} += "\
+    ${QT6_INSTALL_TRANSLATIONSDIR} \
+    ${QT6_INSTALL_DATADIR}/resources \
+"
+
+# QA Issue: qtwebengine: ELF binary /usr/lib/libQt6WebEngineCore.so.6.3.0 has relocations in .text [textrel]
+# when proprietary-codecs is enabled
+INSANE_SKIP:${PN} += "textrel"

recipes-qt/qt6/qtwebsockets_git.bb

@@ -1,16 +1,17 @@
-LICENSE = "GFDL-1.3 & (GPL-3 | LGPL-3.0) | The-Qt-Company-Commercial"
+LICENSE = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0-or-later | LGPL-3.0-only ) | The-Qt-Company-Commercial"
 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.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
+    file://LICENSE.FDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \
 "
 
 inherit qt6-cmake
 
 include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
 include recipes-qt/qt6/qt6.inc
 
-DEPENDS += "qtbase qtdeclarative"
+DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
 
-SRCREV = "18a269460d88905706019000ba85f2deef62168f"

recipes-qt/qt6/qtwebview_git.bb

@@ -0,0 +1,16 @@
+LICENSE = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 ) & ( GPL-2.0-or-later | LGPL-3.0-only ) | The-Qt-Company-Commercial"
+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 \
+"
+
+inherit qt6-cmake
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6-lts.inc
+include recipes-qt/qt6/qt6.inc
+
+DEPENDS += "qtbase qtdeclarative qtdeclarative-native qtwebengine"