Merge tag 'v6.2.8-lts' into '6.2'

meta-qt6 v6.2.8-lts release

Change-Id: I7d63c0d3c306f08d2bd529a197234a82104f7c70

12 files changed, 130 insertions, 91 deletions

diff --git a/classes/populate_sdk_qt6.bbclass b/classes/populate_sdk_qt6.bbclass
new file mode 100644
index 0000000..14fb21c
--- /dev/null
+++ b/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"
diff --git a/classes/populate_sdk_qt6_base.bbclass b/classes/populate_sdk_qt6_base.bbclass
index d66db42..a6a7478 100644
--- a/classes/populate_sdk_qt6_base.bbclass
+++ b/classes/populate_sdk_qt6_base.bbclass
@@ -10,6 +10,9 @@ PATH_DELIM:sdkmingw32 = ";"
 QT6_INSTALL_HOST_LIBEXECDIR = "${QT6_INSTALL_LIBEXECDIR}"
 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
@@ -28,23 +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 = ${@os.path.relpath(d.expand("${SDKPATHNATIVE}"), d.expand("${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}"))}' >> $qtconf
-    echo 'HostData = ${@os.path.relpath(d.expand("${SDKTARGETSYSROOT}${QT6_INSTALL_ARCHDATADIR}"), d.expand("${SDKPATHNATIVE}"))}' >> $qtconf
-    echo 'HostBinaries = ${@os.path.relpath(d.expand("${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}"), d.expand("${SDKPATHNATIVE}"))}' >> $qtconf
-    echo 'HostLibraries = ${@os.path.relpath(d.expand("${SDKPATHNATIVE}${QT6_INSTALL_LIBDIR}"), d.expand("${SDKPATHNATIVE}"))}' >> $qtconf
-    echo 'HostLibraryExecutables = ${@os.path.relpath(d.expand("${SDKPATHNATIVE}${QT6_INSTALL_HOST_LIBEXECDIR}"), d.expand("${SDKPATHNATIVE}"))}' >> $qtconf
-    echo 'Sysroot = ${@os.path.relpath(d.expand("${SDKTARGETSYSROOT}"), d.expand("${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}"))}' >> $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}${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}/target_qt.conf
+    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
@@ -57,36 +60,21 @@ 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_PREFIX]${bindir}/${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
+    cat > ${SDK_OUTPUT}${NATIVE_SYSROOT}/usr/share/cmake/Qt6Toolchain.cmake <<EOF
 cmake_minimum_required(VERSION 3.11)
 include_guard(GLOBAL)
 
 get_filename_component(SYSROOTS \${CMAKE_CURRENT_LIST_DIR}/../../../.. ABSOLUTE)
 
-set(ENV{PATH} "${SDKPATHNATIVE}${bindir}${PATH_DELIM}\$ENV{PATH}")
-set(ENV{PKG_CONFIG_SYSROOT_DIR} "${SDKTARGETSYSROOT}")
-set(ENV{PKG_CONFIG_PATH} "${SDKTARGETSYSROOT}${libdir}/pkgconfig")
+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(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSROOT ${SDKTARGETSYSROOT})
+set(CMAKE_SYSROOT ${TARGET_SYSROOT})
 
-set(CMAKE_FIND_ROOT_PATH ${SDKTARGETSYSROOT})
+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)
@@ -94,10 +82,10 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 
 set(CMAKE_SYSTEM_PROCESSOR ${TUNE_PKGARCH})
 
-set(CMAKE_C_COMPILER "${SDKPATHNATIVE}${bindir}/${TARGET_SYS}/${TARGET_PREFIX}gcc${EXE_EXT}")
-set(CMAKE_CXX_COMPILER "${SDKPATHNATIVE}${bindir}/${TARGET_SYS}/${TARGET_PREFIX}g++${EXE_EXT}")
+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=${SDKTARGETSYSROOT}")
+set(TARGET_COMPILER_FLAGS "${TARGET_CC_ARCH} --sysroot=${TARGET_SYSROOT}")
 set(TARGET_LINKER_FLAGS "${TARGET_LDFLAGS}")
 
 include(CMakeInitializeConfigs)
@@ -135,17 +123,17 @@ EOF
 
     # resolve absolute paths at runtime
     sed -i -e 's|${SDKPATH}/sysroots|\${SYSROOTS}|g' \
-        ${SDK_OUTPUT}${SDKPATHNATIVE}/usr/share/cmake/Qt6Toolchain.cmake
+        ${SDK_OUTPUT}${NATIVE_SYSROOT}/usr/share/cmake/Qt6Toolchain.cmake
 
     # Conan profile
-    mkdir -p ${SDK_OUTPUT}${SDKPATHNATIVE}/usr/share/conan
-    cat > ${SDK_OUTPUT}${SDKPATHNATIVE}/usr/share/conan/profile <<EOF
-include(${SDKTARGETSYSROOT}${datadir}/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=${SDKPATHNATIVE}${QT6_INSTALL_BINDIR}/qt-configure-module
+QT_CONFIGURE_MODULE=${NATIVE_SYSROOT}${QT6_INSTALL_BINDIR}/qt-configure-module
 EOF
 }
 
 # default debug prefix map isn't valid in the SDK
 DEBUG_PREFIX_MAP = ""
-SECURITY_CFLAGS = ""
+lcl_maybe_fortify = ""
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index a88a074..fb4c7fa 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -119,6 +119,7 @@ instructions:
       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} \
diff --git a/coin/test-configs.inc b/coin/test-configs.inc
index 22ee90a..46a70bc 100644
--- a/coin/test-configs.inc
+++ b/coin/test-configs.inc
@@ -19,8 +19,6 @@ 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 \
@@ -63,6 +61,7 @@ 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"
diff --git a/conf/layer.conf b/conf/layer.conf
index 2b04b07..4ac3c92 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -39,6 +39,7 @@ QT_GIT_PROJECT ?= "qt"
 QT_GIT ?= "git://code.qt.io"
 QT_GIT_PROTOCOL ?= "git"
 QT_EDITION ?= "opensource"
+QT_VERSION = "6.2.8"
 
 QT_COMMERCIAL_GIT ?= "git://codereview.qt-project.org"
 QT_COMMERCIAL_GIT_PROTOCOL ?= "ssh"
diff --git a/recipes-core/meta/build-sysroots.bbappend b/recipes-core/meta/build-sysroots.bbappend
new file mode 100644
index 0000000..626b99b
--- /dev/null
+++ b/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
diff --git a/recipes-qt/meta/meta-toolchain-qt6.bb b/recipes-qt/meta/meta-toolchain-qt6.bb
index 50e6345..2f5e82c 100644
--- a/recipes-qt/meta/meta-toolchain-qt6.bb
+++ b/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
diff --git a/recipes-qt/packagegroups/packagegroup-qt6-commercial-modules.bb b/recipes-qt/packagegroups/packagegroup-qt6-commercial-modules.bb
index 0962f0c..c4155ee 100644
--- a/recipes-qt/packagegroups/packagegroup-qt6-commercial-modules.bb
+++ b/recipes-qt/packagegroups/packagegroup-qt6-commercial-modules.bb
@@ -9,4 +9,5 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
 RDEPENDS:${PN} += " \
     qmlcompilerplus \
+    qtinsighttracker \
 "
diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc
index d05bf1a..164e506 100644
--- a/recipes-qt/qt6/qt6-git.inc
+++ b/recipes-qt/qt6/qt6-git.inc
@@ -8,53 +8,54 @@ QT_MODULE_REPO ?= "${QT_MODULE}.git"
 
 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.7"
+PV = "${QT_VERSION}"
 
 SRCREV = "${SRCREV_${QT_MODULE}}"
 
-SRCREV_tqtc-qmlcompilerplus = "fbaa907ac917349ebd56186a71e614573c50a8c7"
-SRCREV_qt3d = "9147dedeaec429b01049eeca152b95a64466a717"
+SRCREV_tqtc-qmlcompilerplus = "754b31052cae461ae5e77a3eabd63f684294d7ed"
+SRCREV_tqtc-qtinsighttracker = "a0d11dfd4525045ce4260bfb1b407dfcbcc1c1d3"
+SRCREV_qt3d = "ef051d6a341bd8e426715421622ed8d63d2afb40"
 SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
-SRCREV_qt5compat = "b738416cd8e25a8f3053a7e14971d9833366e7d1"
-SRCREV_qtbase = "694575a59b5370afc494fbf700eee8db1d1ec091"
-SRCREV_qtapplicationmanager = "26f518eab625ecf239b0d70de9a9d99e91475c48"
-SRCREV_qtcharts = "717118a5d1e33da81651647d6ebb9ceed215227f"
-SRCREV_qtcoap = "f1a44aa12480ef423190e8a7384fbc350b8de131"
-SRCREV_qtconnectivity = "32748a3b04f67af77573eefdc36586d4f7f49e98"
-SRCREV_qtdatavis3d = "ddb5e26a228e30a9a0f4daf7d21da6ed8e31cb88"
-SRCREV_qtdeclarative = "02277e3753613d9e19bbb36367c7d2b1d13d7545"
-SRCREV_qtdeviceutilities = "71b1bd86baca298373b22114bf14dc38c039b2e4"
-SRCREV_qtimageformats = "607e0da419b604b971ce01f51bc94920c61191f7"
-SRCREV_qtinterfaceframework = "0b5ba2204372171cab0350627bcb3137232ad4d1"
-SRCREV_qtlottie = "a26e9841a45a564da8bd89c33030658f99a5487d"
-SRCREV_qtmqtt = "a390c6aca3cb0e2f6f95b7817cda1ad42e43f689"
-SRCREV_qtmultimedia = "7d7a5a372afd1e1c9f6407f8fd90b5ee56723367"
-SRCREV_qtnetworkauth = "b0aee755ddcf4adfde9dd36f05c4d9d80836db76"
-SRCREV_qtopcua = "12ec1956e7acbda90ee7965adca52e513f3cab4c"
-SRCREV_qtpositioning = "5273ae2bea443f25484a7156173d6fb84c93973a"
-SRCREV_qtquick3d = "2844d9c0575249f56ff11d6b45364ec3fd9c2a06"
+SRCREV_qt5compat = "0587bd991d911e12089191e4dbdbc2e2298b4f73"
+SRCREV_qtbase = "ca128e25119c0b259d083567c796bfa67b100a42"
+SRCREV_qtapplicationmanager = "f51ea3b93c350325c240e762b13dbfe14a721efa"
+SRCREV_qtcharts = "5e0698c8caff40400ef6bea79e373cfa0c1542ad"
+SRCREV_qtcoap = "f42e12d900ba8cae6fb7f04ac467dfecda74492c"
+SRCREV_qtconnectivity = "ddfb06fb8a2df4d9bf13eabb52edd3ad858b8c14"
+SRCREV_qtdatavis3d = "1385dbb068b33a775fa00218fb72d23e34754be5"
+SRCREV_qtdeclarative = "a7df6331b29e44ed364fcd7297c4e1bc6ce2167c"
+SRCREV_qtdeviceutilities = "4d6b2a4218f0b6e7d9ab189d2aa6898f0ed542c8"
+SRCREV_qtimageformats = "02f37ef2aebf8ec7ff01e6c6a659394b62c363c2"
+SRCREV_qtinterfaceframework = "0f40281c6494937d32d07d2819d40ed5bd09f5a7"
+SRCREV_qtlottie = "73ce0c571a0ad11fdffe76a464fc25a90b67acc1"
+SRCREV_qtmqtt = "7e1b2e5fd2d791c8a9a1681193234e4adc7a259f"
+SRCREV_qtmultimedia = "92848e037a6ded98a8bc4485cdad4a239685a342"
+SRCREV_qtnetworkauth = "e0305f57fcd89fc29810ab2ede5afb08b3a23476"
+SRCREV_qtopcua = "e8ed86ffd3dfc4586512502da649b02e5d4d7069"
+SRCREV_qtpositioning = "6a52509ff725a56e9246034b941d56f9d125973a"
+SRCREV_qtquick3d = "eea28db9ee61f2ab56d8f25e907dc4e459f64ee6"
 SRCREV_qtquick3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5"
-SRCREV_qtquickdesigner-components = "eef765c5ed34eac8c1294fbeda55d273f916ca86"
-SRCREV_qtquicktimeline = "6a0299be9c2e4abbd1c53ee0807144f8718c373a"
-SRCREV_qtremoteobjects = "966fc136d40ec3553607d5993faccaf50ea523a7"
-SRCREV_qtscxml = "1055d91fd8987ec757769418a87e090f14d98d6d"
-SRCREV_qtsensors = "c929381dcdb4f9f2da82f78fb53908ef06a3f73a"
-SRCREV_qtserialbus = "ee9ed9d833c3db9eb9d03c426962eafdf5866aff"
-SRCREV_qtserialport = "c41c1c113e6d93198d15b72406a8c6954a11051a"
-SRCREV_qtshadertools = "5de9eb91f047e8001ac24f0bdf5ffc72adb37236"
-SRCREV_qtsvg = "42fb62219b3d41481f4065d222f227614f41fbe8"
-SRCREV_qttools = "0f75d2b2e6c4a049682c2cc520cfc9184ef52454"
+SRCREV_qtquickdesigner-components = "b3f1dcf0d1b46af04aafd59ceecdc9257fca0e71"
+SRCREV_qtquicktimeline = "c337484e94eb874ca07d65224f397fb623975913"
+SRCREV_qtremoteobjects = "ef95cf942559e22ad08a8709db2b622df2bdbee4"
+SRCREV_qtscxml = "5169060f2180b0a759f96385f3c76e600ea4e814"
+SRCREV_qtsensors = "219cb723065853aec88d79a4094bd9aee5ab35bd"
+SRCREV_qtserialbus = "bb961f70b476987ddc256407c176ea27c94f0af0"
+SRCREV_qtserialport = "ad17f20e332db9d45b64a13d1f80ab92934d22fa"
+SRCREV_qtshadertools = "58b31c6148a6a49273a092b1d15c18b441c980bd"
+SRCREV_qtsvg = "48abc06106b59191c981cbf88056c58b4db051a0"
+SRCREV_qttools = "ebfc89aa0b6a62a4fe17ed4a97c70518b8332dc1"
 SRCREV_qttools-qlitehtml = "4931b7aa30f256c20573d283561aa432fecf8f38"
 SRCREV_qttools-qlitehtml-litehtml = "6236113734bb0a28467e5999e86fdd2834be8e01"
-SRCREV_qttranslations = "eaababaebf33536fd7337a5bedfd51b4194a1806"
-SRCREV_qtvirtualkeyboard = "cca15977ed4d59603bc914cba39f2a7073f49920"
-SRCREV_qtwayland = "009790624bf0619ffc6a1bb7f95cd3144c0e5c63"
-SRCREV_qtwebchannel = "a99c381a9f179122335d6ff6413438e1724588c4"
-SRCREV_qtwebengine = "46aad3d05bc8944286f603b70be88b341e71119a"
-SRCREV_qtwebengine-chromium = "a0f47d475cd2411cacc985ebee6f20c0692a2969"
-SRCREV_qtwebsockets = "f14626e48c704f82fcb510ad6e6e26722c2dad15"
-SRCREV_qtwebview = "66bcbe7ab41f0502b7cc5af784658e1c583b7b11"
+SRCREV_qttranslations = "d53fc14c01083f5825c75b5a99a605ceb30f4ebc"
+SRCREV_qtvirtualkeyboard = "74e86378225f2d3244c4de1ed1b5d22f59c0e97c"
+SRCREV_qtwayland = "676a776e15f36f069debcc27b584f48e583ee7cb"
+SRCREV_qtwebchannel = "8e2150448493962998413257514a605b24792696"
+SRCREV_qtwebengine = "43cd26bfcd78f0b38f286f108ad7a04374695fce"
+SRCREV_qtwebengine-chromium = "c885ec409f9b6ffa25e03851729b1bc2ad2005b3"
+SRCREV_qtwebsockets = "b87b72cfff754136721d9ab3ac878e1182184f83"
+SRCREV_qtwebview = "1ae83597c2e326f6bda47070a833bac61264218f"
diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb
index 6105e19..21276ef 100644
--- a/recipes-qt/qt6/qtbase_git.bb
+++ b/recipes-qt/qt6/qtbase_git.bb
@@ -30,7 +30,7 @@ DEPENDS:remove:class-native = "qtbase-native"
 RDEPENDS_${PN}:remove:class-native = "libssl-native"
 
 PACKAGECONFIG:class-native ?= "\
-    gui widgets png dbus no-opengl openssl \
+    gui widgets jpeg png dbus no-opengl openssl zlib \
     ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'zstd', '', d)} \
 "
 PACKAGECONFIG:class-nativesdk ?= "${PACKAGECONFIG:class-native}"
@@ -147,7 +147,7 @@ EXTRA_OECMAKE:append:mingw32 = "\
 SYSROOT_DIRS += "${QT6_INSTALL_MKSPECSDIR}"
 
 do_install:append() {
-    sed -i ${D}${libdir}/cmake/Qt6BuildInternals/QtBuildInternalsExtra.cmake \
+    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
@@ -177,6 +177,28 @@ EOF
         -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"
 INHIBIT_PACKAGE_STRIP_FILES = "\
     ${PKGD}${PTEST_PATH}/tests/auto/corelib/plugin/qpluginloader/elftest/corrupt2.elf64.so \
diff --git a/recipes-qt/qt6/qtinsighttracker_git.bb b/recipes-qt/qt6/qtinsighttracker_git.bb
new file mode 100644
index 0000000..e440e30
--- /dev/null
+++ b/recipes-qt/qt6/qtinsighttracker_git.bb
@@ -0,0 +1,12 @@
+LICENSE = "The-Qt-Company-Commercial"
+LIC_FILES_CHKSUM = "file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187"
+
+inherit qt6-cmake
+
+include recipes-qt/qt6/qt6-git.inc
+include recipes-qt/qt6/qt6.inc
+include recipes-qt/qt6/qt6-commercial.inc
+
+DEPENDS += "qtbase qtdeclarative qtdeclarative-native"
+
+FILES:${PN} += "${QT6_INSTALL_DATADIR}/qtinsight"
diff --git a/recipes-qt/qt6/qtserialbus_git.bb b/recipes-qt/qt6/qtserialbus_git.bb
index c63507d..85db9ce 100644
--- a/recipes-qt/qt6/qtserialbus_git.bb
+++ b/recipes-qt/qt6/qtserialbus_git.bb
@@ -13,7 +13,9 @@ include recipes-qt/qt6/qt6.inc
 
 DEPENDS += "qtbase"
 
-PACKAGECONFIG ?= "modbus-serialport socketcan"
+PACKAGECONFIG ?= "modbus-serialport \
+    ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'socketcan', '', d)} \
+"
 PACKAGECONFIG:class-native = ""
 PACKAGECONFIG:class-nativesdk = ""