From d244b9de473dceed896f4eab63f8c08445bcbc65 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 18 Oct 2023 13:04:04 +0000 Subject: [PATCH 01/20] Workaround too eager packagegroup sanity check Amend 95fa269ffa7a1088f3da7e060250a82a5184b58f and add same workaround also for the commercial packagegroup to prevent QA error: "An allarch packagegroup shouldn't depend on packages which are dynamically renamed." Change-Id: I6eaee9aa74681cfb70fb738d966cd7381f4bcdb0 Reviewed-by: Teemu Holappa (cherry picked from commit 511db28072d521821968f9b5f5bb1179984478d0) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 3b9ed8a29d59ad98d6e77d712cefb8dd5906ee79) --- .../nativesdk-packagegroup-qt6-toolchain-host-commercial.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-commercial.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-commercial.bb index fb301e0..0479a47 100644 --- a/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-commercial.bb +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-qt6-toolchain-host-commercial.bb @@ -1,6 +1,9 @@ DESCRIPTION = "Qt6 development host commercial packages" LICENSE = "MIT" +# disable sanity check for allarch packagegroup +PACKAGE_ARCH = "" + inherit packagegroup nativesdk PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" From 8e9598a2008fc008021aa1ab6c31b8cd8175a2c3 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 23 Oct 2023 13:09:02 +0300 Subject: [PATCH 02/20] Update Qt branch in qt6-commercial.inc Use lts branch. Change-Id: Ib1637649b1778df3cfa50b716affb860c449d44b Reviewed-by: Samuli Piippo --- recipes-qt/qt6/qt6-commercial.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/qt6/qt6-commercial.inc b/recipes-qt/qt6/qt6-commercial.inc index 1fdb8cd..268c8b6 100644 --- a/recipes-qt/qt6/qt6-commercial.inc +++ b/recipes-qt/qt6/qt6-commercial.inc @@ -6,3 +6,4 @@ python() { QT_GIT = "${QT_COMMERCIAL_GIT}" QT_GIT_PROTOCOL = "${QT_COMMERCIAL_GIT_PROTOCOL}" QT_MODULE = "tqtc-${BPN}" +QT_MODULE_BRANCH := "tqtc/lts-${QT_MODULE_BRANCH}" From 67eeece3397ead07237610b8ff6a3de8675b1b00 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Wed, 18 Oct 2023 14:34:55 +0300 Subject: [PATCH 03/20] qt6: switch to commercial-only LTS repos and branches 6.5 enters LTS phase. Change-Id: I09d479153a75489de12a877fbfa5cc2f1ec4ea07 Reviewed-by: Samuli Piippo --- recipes-qt/qt6/qt3d_git.bb | 1 + recipes-qt/qt6/qt5compat_git.bb | 1 + recipes-qt/qt6/qtapplicationmanager_git.bb | 1 + recipes-qt/qt6/qtbase_git.bb | 1 + recipes-qt/qt6/qtcharts_git.bb | 1 + recipes-qt/qt6/qtcoap_git.bb | 1 + recipes-qt/qt6/qtconnectivity_git.bb | 1 + recipes-qt/qt6/qtdatavis3d_git.bb | 1 + recipes-qt/qt6/qtdeclarative_git.bb | 1 + recipes-qt/qt6/qtdeviceutilities_git.bb | 1 + recipes-qt/qt6/qtgrpc_git.bb | 1 + recipes-qt/qt6/qthttpserver_git.bb | 1 + recipes-qt/qt6/qtimageformats_git.bb | 1 + recipes-qt/qt6/qtinterfaceframework_git.bb | 1 + recipes-qt/qt6/qtlanguageserver_git.bb | 1 + recipes-qt/qt6/qtlocation_git.bb | 1 + recipes-qt/qt6/qtlottie_git.bb | 1 + recipes-qt/qt6/qtmqtt_git.bb | 1 + recipes-qt/qt6/qtmultimedia_git.bb | 1 + recipes-qt/qt6/qtnetworkauth_git.bb | 1 + recipes-qt/qt6/qtopcua_git.bb | 1 + recipes-qt/qt6/qtpositioning_git.bb | 1 + recipes-qt/qt6/qtquick3d_git.bb | 1 + recipes-qt/qt6/qtquick3dphysics_git.bb | 1 + recipes-qt/qt6/qtquicktimeline_git.bb | 1 + recipes-qt/qt6/qtremoteobjects_git.bb | 1 + recipes-qt/qt6/qtscxml_git.bb | 1 + recipes-qt/qt6/qtsensors_git.bb | 1 + recipes-qt/qt6/qtserialbus_git.bb | 1 + recipes-qt/qt6/qtserialport_git.bb | 1 + recipes-qt/qt6/qtshadertools_git.bb | 1 + recipes-qt/qt6/qtspeech_git.bb | 1 + recipes-qt/qt6/qtsvg_git.bb | 1 + recipes-qt/qt6/qttools_git.bb | 1 + recipes-qt/qt6/qttranslations_git.bb | 1 + recipes-qt/qt6/qtvirtualkeyboard_git.bb | 1 + recipes-qt/qt6/qtwayland_git.bb | 1 + recipes-qt/qt6/qtwebchannel_git.bb | 1 + recipes-qt/qt6/qtwebengine.inc | 1 + recipes-qt/qt6/qtwebsockets_git.bb | 1 + recipes-qt/qt6/qtwebview_git.bb | 1 + 41 files changed, 41 insertions(+) diff --git a/recipes-qt/qt6/qt3d_git.bb b/recipes-qt/qt6/qt3d_git.bb index a53a164..5903e9d 100644 --- a/recipes-qt/qt6/qt3d_git.bb +++ b/recipes-qt/qt6/qt3d_git.bb @@ -19,6 +19,7 @@ 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" diff --git a/recipes-qt/qt6/qt5compat_git.bb b/recipes-qt/qt6/qt5compat_git.bb index a063024..fca4b06 100644 --- a/recipes-qt/qt6/qt5compat_git.bb +++ b/recipes-qt/qt6/qt5compat_git.bb @@ -13,6 +13,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 ENABLE_QMLCOMPILER = "0" diff --git a/recipes-qt/qt6/qtapplicationmanager_git.bb b/recipes-qt/qt6/qtapplicationmanager_git.bb index 1c005c6..7883060 100644 --- a/recipes-qt/qt6/qtapplicationmanager_git.bb +++ b/recipes-qt/qt6/qtapplicationmanager_git.bb @@ -11,6 +11,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 qtdeclarative libyaml libarchive qtapplicationmanager-native" diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index 6d5086e..487c24e 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -15,6 +15,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 include recipes-qt/qt6/conan.inc diff --git a/recipes-qt/qt6/qtcharts_git.bb b/recipes-qt/qt6/qtcharts_git.bb index 5bcbc7d..a471450 100644 --- a/recipes-qt/qt6/qtcharts_git.bb +++ b/recipes-qt/qt6/qtcharts_git.bb @@ -9,6 +9,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" diff --git a/recipes-qt/qt6/qtcoap_git.bb b/recipes-qt/qt6/qtcoap_git.bb index 4eba33f..bd6f9a0 100644 --- a/recipes-qt/qt6/qtcoap_git.bb +++ b/recipes-qt/qt6/qtcoap_git.bb @@ -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 DEPENDS += "qtbase" diff --git a/recipes-qt/qt6/qtconnectivity_git.bb b/recipes-qt/qt6/qtconnectivity_git.bb index e5c4851..c621510 100644 --- a/recipes-qt/qt6/qtconnectivity_git.bb +++ b/recipes-qt/qt6/qtconnectivity_git.bb @@ -12,6 +12,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 # QTBUG-93565 diff --git a/recipes-qt/qt6/qtdatavis3d_git.bb b/recipes-qt/qt6/qtdatavis3d_git.bb index 474ced0..e994dfc 100644 --- a/recipes-qt/qt6/qtdatavis3d_git.bb +++ b/recipes-qt/qt6/qtdatavis3d_git.bb @@ -9,6 +9,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 qtdeclarative qtdeclarative-native" diff --git a/recipes-qt/qt6/qtdeclarative_git.bb b/recipes-qt/qt6/qtdeclarative_git.bb index 75541a2..e7bdac6 100644 --- a/recipes-qt/qt6/qtdeclarative_git.bb +++ b/recipes-qt/qt6/qtdeclarative_git.bb @@ -13,6 +13,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 qtshadertools qtshadertools-native qtdeclarative-native qtlanguageserver" diff --git a/recipes-qt/qt6/qtdeviceutilities_git.bb b/recipes-qt/qt6/qtdeviceutilities_git.bb index 6ae3835..7bbc150 100644 --- a/recipes-qt/qt6/qtdeviceutilities_git.bb +++ b/recipes-qt/qt6/qtdeviceutilities_git.bb @@ -4,6 +4,7 @@ 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" diff --git a/recipes-qt/qt6/qtgrpc_git.bb b/recipes-qt/qt6/qtgrpc_git.bb index 0d2751b..fc612b6 100644 --- a/recipes-qt/qt6/qtgrpc_git.bb +++ b/recipes-qt/qt6/qtgrpc_git.bb @@ -11,6 +11,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 qtgrpc-native protobuf protobuf-native" diff --git a/recipes-qt/qt6/qthttpserver_git.bb b/recipes-qt/qt6/qthttpserver_git.bb index 385a58b..614e1e0 100644 --- a/recipes-qt/qt6/qthttpserver_git.bb +++ b/recipes-qt/qt6/qthttpserver_git.bb @@ -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 DEPENDS += "qtbase" diff --git a/recipes-qt/qt6/qtimageformats_git.bb b/recipes-qt/qt6/qtimageformats_git.bb index bac148c..565f31c 100644 --- a/recipes-qt/qt6/qtimageformats_git.bb +++ b/recipes-qt/qt6/qtimageformats_git.bb @@ -11,6 +11,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" diff --git a/recipes-qt/qt6/qtinterfaceframework_git.bb b/recipes-qt/qt6/qtinterfaceframework_git.bb index f13d5b2..9a78357 100644 --- a/recipes-qt/qt6/qtinterfaceframework_git.bb +++ b/recipes-qt/qt6/qtinterfaceframework_git.bb @@ -11,6 +11,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 # Default build and package these diff --git a/recipes-qt/qt6/qtlanguageserver_git.bb b/recipes-qt/qt6/qtlanguageserver_git.bb index 238b4f5..d783633 100644 --- a/recipes-qt/qt6/qtlanguageserver_git.bb +++ b/recipes-qt/qt6/qtlanguageserver_git.bb @@ -11,6 +11,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" diff --git a/recipes-qt/qt6/qtlocation_git.bb b/recipes-qt/qt6/qtlocation_git.bb index 971f6f0..26d6d3e 100644 --- a/recipes-qt/qt6/qtlocation_git.bb +++ b/recipes-qt/qt6/qtlocation_git.bb @@ -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 DEPENDS += "qtbase qtpositioning" diff --git a/recipes-qt/qt6/qtlottie_git.bb b/recipes-qt/qt6/qtlottie_git.bb index 4d71975..7342e5a 100644 --- a/recipes-qt/qt6/qtlottie_git.bb +++ b/recipes-qt/qt6/qtlottie_git.bb @@ -9,6 +9,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 qtdeclarative qtdeclarative-native" diff --git a/recipes-qt/qt6/qtmqtt_git.bb b/recipes-qt/qt6/qtmqtt_git.bb index 98d798d..eda12a3 100644 --- a/recipes-qt/qt6/qtmqtt_git.bb +++ b/recipes-qt/qt6/qtmqtt_git.bb @@ -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 DEPENDS += "qtbase" diff --git a/recipes-qt/qt6/qtmultimedia_git.bb b/recipes-qt/qt6/qtmultimedia_git.bb index a2be688..4e292ab 100644 --- a/recipes-qt/qt6/qtmultimedia_git.bb +++ b/recipes-qt/qt6/qtmultimedia_git.bb @@ -16,6 +16,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 qtshadertools qtshadertools-native" diff --git a/recipes-qt/qt6/qtnetworkauth_git.bb b/recipes-qt/qt6/qtnetworkauth_git.bb index cfab20e..66ebc89 100644 --- a/recipes-qt/qt6/qtnetworkauth_git.bb +++ b/recipes-qt/qt6/qtnetworkauth_git.bb @@ -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 DEPENDS += "qtbase" diff --git a/recipes-qt/qt6/qtopcua_git.bb b/recipes-qt/qt6/qtopcua_git.bb index 0759cb8..dff40dc 100644 --- a/recipes-qt/qt6/qtopcua_git.bb +++ b/recipes-qt/qt6/qtopcua_git.bb @@ -18,6 +18,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 PACKAGECONFIG ?= "qml" diff --git a/recipes-qt/qt6/qtpositioning_git.bb b/recipes-qt/qt6/qtpositioning_git.bb index 9b6bf3c..6986d04 100644 --- a/recipes-qt/qt6/qtpositioning_git.bb +++ b/recipes-qt/qt6/qtpositioning_git.bb @@ -13,6 +13,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" diff --git a/recipes-qt/qt6/qtquick3d_git.bb b/recipes-qt/qt6/qtquick3d_git.bb index 1dbc762..2bd0b54 100644 --- a/recipes-qt/qt6/qtquick3d_git.bb +++ b/recipes-qt/qt6/qtquick3d_git.bb @@ -16,6 +16,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 ASSIMP_BRANCH = "qt6_assimp" diff --git a/recipes-qt/qt6/qtquick3dphysics_git.bb b/recipes-qt/qt6/qtquick3dphysics_git.bb index c7a106e..ccf1797 100644 --- a/recipes-qt/qt6/qtquick3dphysics_git.bb +++ b/recipes-qt/qt6/qtquick3dphysics_git.bb @@ -11,6 +11,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 COMPATIBLE_MACHINE = "(-)" diff --git a/recipes-qt/qt6/qtquicktimeline_git.bb b/recipes-qt/qt6/qtquicktimeline_git.bb index ec8520d..bddc552 100644 --- a/recipes-qt/qt6/qtquicktimeline_git.bb +++ b/recipes-qt/qt6/qtquicktimeline_git.bb @@ -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 DEPENDS = "qtbase qtdeclarative qtdeclarative-native" diff --git a/recipes-qt/qt6/qtremoteobjects_git.bb b/recipes-qt/qt6/qtremoteobjects_git.bb index 8270a77..d6e5198 100644 --- a/recipes-qt/qt6/qtremoteobjects_git.bb +++ b/recipes-qt/qt6/qtremoteobjects_git.bb @@ -12,6 +12,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 qtdeclarative qtremoteobjects-native" diff --git a/recipes-qt/qt6/qtscxml_git.bb b/recipes-qt/qt6/qtscxml_git.bb index 895026e..731a861 100644 --- a/recipes-qt/qt6/qtscxml_git.bb +++ b/recipes-qt/qt6/qtscxml_git.bb @@ -12,6 +12,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" diff --git a/recipes-qt/qt6/qtsensors_git.bb b/recipes-qt/qt6/qtsensors_git.bb index bd05d95..7c87528 100644 --- a/recipes-qt/qt6/qtsensors_git.bb +++ b/recipes-qt/qt6/qtsensors_git.bb @@ -12,6 +12,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 qtdeclarative qtdeclarative-native" diff --git a/recipes-qt/qt6/qtserialbus_git.bb b/recipes-qt/qt6/qtserialbus_git.bb index 5d6dcd0..4530036 100644 --- a/recipes-qt/qt6/qtserialbus_git.bb +++ b/recipes-qt/qt6/qtserialbus_git.bb @@ -12,6 +12,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" diff --git a/recipes-qt/qt6/qtserialport_git.bb b/recipes-qt/qt6/qtserialport_git.bb index c9f1123..fa03de1 100644 --- a/recipes-qt/qt6/qtserialport_git.bb +++ b/recipes-qt/qt6/qtserialport_git.bb @@ -12,6 +12,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" diff --git a/recipes-qt/qt6/qtshadertools_git.bb b/recipes-qt/qt6/qtshadertools_git.bb index 5eceb97..5237f7f 100644 --- a/recipes-qt/qt6/qtshadertools_git.bb +++ b/recipes-qt/qt6/qtshadertools_git.bb @@ -13,6 +13,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 qtshadertools-native" diff --git a/recipes-qt/qt6/qtspeech_git.bb b/recipes-qt/qt6/qtspeech_git.bb index f05a2af..f910e77 100644 --- a/recipes-qt/qt6/qtspeech_git.bb +++ b/recipes-qt/qt6/qtspeech_git.bb @@ -11,6 +11,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" diff --git a/recipes-qt/qt6/qtsvg_git.bb b/recipes-qt/qt6/qtsvg_git.bb index f5e1a34..5a274fd 100644 --- a/recipes-qt/qt6/qtsvg_git.bb +++ b/recipes-qt/qt6/qtsvg_git.bb @@ -13,6 +13,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" diff --git a/recipes-qt/qt6/qttools_git.bb b/recipes-qt/qt6/qttools_git.bb index 578c0c4..c1f0fce 100644 --- a/recipes-qt/qt6/qttools_git.bb +++ b/recipes-qt/qt6/qttools_git.bb @@ -15,6 +15,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 += " \ diff --git a/recipes-qt/qt6/qttranslations_git.bb b/recipes-qt/qt6/qttranslations_git.bb index 8be3f1d..526742e 100644 --- a/recipes-qt/qt6/qttranslations_git.bb +++ b/recipes-qt/qt6/qttranslations_git.bb @@ -8,6 +8,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 qttools qttools-native" diff --git a/recipes-qt/qt6/qtvirtualkeyboard_git.bb b/recipes-qt/qt6/qtvirtualkeyboard_git.bb index 38e7487..dda8c95 100644 --- a/recipes-qt/qt6/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt6/qtvirtualkeyboard_git.bb @@ -12,6 +12,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 # To enabled Nuance T9 Write support, you need to provide the licensed components diff --git a/recipes-qt/qt6/qtwayland_git.bb b/recipes-qt/qt6/qtwayland_git.bb index e0a5237..f839139 100644 --- a/recipes-qt/qt6/qtwayland_git.bb +++ b/recipes-qt/qt6/qtwayland_git.bb @@ -14,6 +14,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 +="\ diff --git a/recipes-qt/qt6/qtwebchannel_git.bb b/recipes-qt/qt6/qtwebchannel_git.bb index ec09d1f..74bd88d 100644 --- a/recipes-qt/qt6/qtwebchannel_git.bb +++ b/recipes-qt/qt6/qtwebchannel_git.bb @@ -12,6 +12,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" diff --git a/recipes-qt/qt6/qtwebengine.inc b/recipes-qt/qt6/qtwebengine.inc index 2145c27..d9c095c 100644 --- a/recipes-qt/qt6/qtwebengine.inc +++ b/recipes-qt/qt6/qtwebengine.inc @@ -12,6 +12,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 inherit gettext diff --git a/recipes-qt/qt6/qtwebsockets_git.bb b/recipes-qt/qt6/qtwebsockets_git.bb index bd05d95..7c87528 100644 --- a/recipes-qt/qt6/qtwebsockets_git.bb +++ b/recipes-qt/qt6/qtwebsockets_git.bb @@ -12,6 +12,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 qtdeclarative qtdeclarative-native" diff --git a/recipes-qt/qt6/qtwebview_git.bb b/recipes-qt/qt6/qtwebview_git.bb index dd8b1f7..17c2603 100644 --- a/recipes-qt/qt6/qtwebview_git.bb +++ b/recipes-qt/qt6/qtwebview_git.bb @@ -12,6 +12,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 qtdeclarative qtdeclarative-native qtwebengine" From 439818c5184ef73f65cbaa727721c923f54ccf72 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 18 Oct 2023 13:17:15 +0000 Subject: [PATCH 04/20] protobuf: add workaround for qtgrpc If protoc is enabled for the build, recipes using protobuf will fail when protoc is not available in the recipe sysroot: | The imported target "protobuf::protoc" references the file | | ".../recipe-sysroot/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/bin/protoc-3.21.5.0" | | but this file does not exist. Possible reasons include: | | * The file was deleted, renamed, or moved to another location. | | * An install or uninstall procedure did not complete successfully. | | * The installation package was faulty and contained | | ".../recipe-sysroot/usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/usr/lib/cmake/protobuf/protobuf-targets.cmake" | | but not all the files it references. Use SYSROOT_DIRS to stage the binary to sysroot so it's always available for other recipes. Change-Id: I588c54d0459dbb88bc080e8bf55902e851a0a1d8 Reviewed-by: Mikko Gronoff (cherry picked from commit f00bd7134e1e7b82811f4c10d14ec5d05967f8ae) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 83b545285bee71427d771263b40b6e7170703f57) --- recipes-devtools/protobuf/protobuf_%.bbappend | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 recipes-devtools/protobuf/protobuf_%.bbappend diff --git a/recipes-devtools/protobuf/protobuf_%.bbappend b/recipes-devtools/protobuf/protobuf_%.bbappend new file mode 100644 index 0000000..3394253 --- /dev/null +++ b/recipes-devtools/protobuf/protobuf_%.bbappend @@ -0,0 +1,2 @@ +# CMake requires binaries to exist in sysroot, even if they have wrong architecture. +SYSROOT_DIRS += "${bindir}" From 0dfe159d4945961eabb4a80b873cb30078aa118f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 8 Nov 2023 12:51:21 +0000 Subject: [PATCH 05/20] Update submodule refs on 'lts-6.5' in yocto/meta-qt6 Change-Id: Ibd23f0304309529fc26c01647b03d9e1fc1fb2cb Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 92 +++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index 946facb..92cbf9e 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -16,53 +16,53 @@ PV = "${QT_VERSION}" SRCREV = "${SRCREV_${QT_MODULE}}" -SRCREV_tqtc-qmlcompilerplus = "8783e851444bbb41501198a1a05948c0d83f649a" -SRCREV_tqtc-qtinsighttracker = "8b5b4bd115b17a4e97792df843bd53edc30df08c" -SRCREV_tqtc-qtvncserver = "19050f07c2d1e2fdf14e0bb4c08b144015283ebf" -SRCREV_qt3d = "ade72c57fb1b7672a5ba3053b96ab823718bf8ab" +SRCREV_tqtc-qmlcompilerplus = "c01b73bc91fb41237e12be7e3bae00c0ad098f1d" +SRCREV_tqtc-qtinsighttracker = "5e4b2a184536fe5f2ad7dd548b318bad78a3a8c2" +SRCREV_tqtc-qtvncserver = "c394ab497a261c1f4b9c1694df32b9f93f809986" +SRCREV_qt3d = "fe53113f488eaff1bf54a1faf489b4d2eed6a0ec" SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" -SRCREV_qt5compat = "39ada26234cb9f10bb55c2b4f2833749a95f9af7" -SRCREV_qtbase = "419950004f5ee09bbc83e1437e8e105f02bd2dff" -SRCREV_qtapplicationmanager = "ef53c4d673ed8e814155d178be7021babd49ffba" -SRCREV_qtcharts = "cabb6bcc5f81ff772b51693c4388256db435675d" -SRCREV_qtcoap = "b01fbb671b681250d6c726a9c8f24ebf75c6e852" -SRCREV_qtconnectivity = "a0986269c016fb207f0d612a75580c086ac38a4a" -SRCREV_qtdatavis3d = "a470ac933de67c9bf2d8a808fd48fe7140fdfe95" -SRCREV_qtdeclarative = "d7ba66128eb7e542ce6f2f1582b45e0149159d7f" -SRCREV_qtdeviceutilities = "2b0ccf5bada5dae37b0281e3d56501ceb5c4ec2c" -SRCREV_qtgrpc = "e32083e0ab777dff158133fc2829a1fbd96d3d28" -SRCREV_qthttpserver = "e7ca70e5f76e5f4d88d018e3f744cb453b54cf89" -SRCREV_qtimageformats = "5ef0115a3dfad3da2ceb311df574d5f1d90a45dd" -SRCREV_qtinterfaceframework = "ef03c253d9f9d516049e54e5c0f1a9dc8de90794" -SRCREV_qtlanguageserver = "56c8f1a6cad66b0e5cdd6b22bdb382e9156cd9b2" -SRCREV_qtlocation = "9fefabd49236e6b585729c0fa9981136f7bc7365" -SRCREV_qtlottie = "fd6367d7211ec1e973c81d1485b609cc419e99bf" -SRCREV_qtmqtt = "4a791594418cf9355e918517aba7a854374cf948" -SRCREV_qtmultimedia = "9d0f05dc234879b294c304c1a2dcff7e9fbc9153" -SRCREV_qtnetworkauth = "b0e551058655157f330c3a08b9bde6c6e5a0e367" -SRCREV_qtopcua = "00796b2250e5f0e2b184a436e41db502ded5d17a" -SRCREV_qtpositioning = "b9db9ab1ae59f6639fdf388d349c68609287c498" -SRCREV_qtquick3d = "51e600c51d061b37b2bbdb7d2096adffc49d0dae" +SRCREV_qt5compat = "4b65d3aaa669ca3ebc18f05a48e15357941ac1ab" +SRCREV_qtbase = "6a52727bffbdd83ef33a7d21dd72e10c96a70a11" +SRCREV_qtapplicationmanager = "3c62184e020b3e89018ee064bfbbd1a7d007f6ef" +SRCREV_qtcharts = "4f50e831c8d581d2c47171ba14748922e1c98609" +SRCREV_qtcoap = "676fa1e83ec95419be525f75d9b39ed0cb45854e" +SRCREV_qtconnectivity = "665e1d0c94f6709ee932f715f70357d8195ab5c9" +SRCREV_qtdatavis3d = "a33f86cf766eab893fdd29ab8c5fb324c03a7510" +SRCREV_qtdeclarative = "1101d8035c95fcd72f5e330ae32e6302791b0d2a" +SRCREV_qtdeviceutilities = "8d783aa71cddd7f64a2cfc3a7942063b96dbe92a" +SRCREV_qtgrpc = "c74a3bef71ccd14085235ab057983877c85449dd" +SRCREV_qthttpserver = "4271de351c6b2c8a6810be3d20ceed87c61ac8aa" +SRCREV_qtimageformats = "0e10e3083acf1f3338a8a64544ccdc1357c97525" +SRCREV_qtinterfaceframework = "25cc761246a454d7f108c19a390f5b906096fdd5" +SRCREV_qtlanguageserver = "c0429873acdc8b7990b0005ec939a26df2eb726c" +SRCREV_qtlocation = "20b2f15c4df9d06b32f14a2debbc04a907d798b7" +SRCREV_qtlottie = "10e7722c2e87d4cab767598981602cc03a7d6df7" +SRCREV_qtmqtt = "d6d36370e119ea66ee485089b92fb8ea1eea1320" +SRCREV_qtmultimedia = "c9eb0956fb7e4a7403cdd4cc71d2ad4a54c3a39e" +SRCREV_qtnetworkauth = "3544d473e5f20b61bf5c13e7c4d7704679b0ee96" +SRCREV_qtopcua = "7ad42bb159ab07b49291f82729c836e91603552a" +SRCREV_qtpositioning = "8898c0a38ce094490fb1b126aaa41af716c0a9ea" +SRCREV_qtquick3d = "6cf37a6ce5bc45cc2b7c7cc3de679dfbf21f7065" SRCREV_qtquick3d-assimp = "fd7cd819e9e130385e17e707da31e60b82e787d0" -SRCREV_qtquick3dphysics = "859a72f09454a34d1c4fdb361c74de6cdaef6ed7" -SRCREV_qtquickdesigner-components = "62998be504e483575b8b54586851b26f38773aaa" -SRCREV_qtquicktimeline = "66102475c790653259b26729b23c0553bf7b5277" -SRCREV_qtremoteobjects = "5267f9e7f50c110fb1f4ffd97bcf8797e4c5a175" -SRCREV_qtscxml = "b44a616418616e314cae2399db3a9382262ae16e" -SRCREV_qtsensors = "2a4c91382ef48b1533c9e882c8117ea2bfc66dd0" -SRCREV_qtserialbus = "43e20c0916fd34b5d7569a8f2b39c4d67c394cef" -SRCREV_qtserialport = "0ad4049a9477886790cc059710674d389fda5203" -SRCREV_qtshadertools = "4287f536f1fb95a2609421a730b74b5a52f534ac" -SRCREV_qtspeech = "f8750fbddf3f92ca6685cf13abe70bf294b06a8d" -SRCREV_qtsvg = "5c8ad8e0c26f6ce15ee5f9be469b3f84059e1e03" -SRCREV_qttools = "9712de2e27b0124fb79110a1075e54f4a986a85e" +SRCREV_qtquick3dphysics = "b54c67432bb91705bbc4699d4da71fb75962d04e" +SRCREV_qtquickdesigner-components = "0e457477d54b068abc89cf124daedefe0436dd89" +SRCREV_qtquicktimeline = "1ad31c2948010281a193a76cbd10b1b2aa4828bd" +SRCREV_qtremoteobjects = "6fbf6c6cf3f33b348dd0a0cef8e6514f5c2cd9a7" +SRCREV_qtscxml = "4880f4dd04bbfa841aab0166ed9c8ed121dfb492" +SRCREV_qtsensors = "ad7ceaf4468206213ade8a54768dbf762035d283" +SRCREV_qtserialbus = "ff04048f93305f19850c960540ccc1a57a955de9" +SRCREV_qtserialport = "158b185b5d72f9b7bfdd482b40b0b536db85d565" +SRCREV_qtshadertools = "62bcae5489f49edc90e4ed48f153fbad3f07edfe" +SRCREV_qtspeech = "330c33e9548ab59af2684533d2b138705c5d40c5" +SRCREV_qtsvg = "4cf0b9e535101d6fb4cd74dcbf047f0b7239aefc" +SRCREV_qttools = "6a78863534bffbcd0d50adc6ad9cd9f476f3c3aa" SRCREV_qttools-qlitehtml = "f05f78ef33225823d348ee18f2fa464e95024dd2" SRCREV_qttools-qlitehtml-litehtml = "43af58e8adad70c4f1a0a9235546a246754c1737" -SRCREV_qttranslations = "5b6742f33be42074d5845cabeb977d49403ec0b7" -SRCREV_qtvirtualkeyboard = "67dcef4f7f48a007d1922a6539286afde8ae4179" -SRCREV_qtwayland = "623ff4913fff6af96fd88794ecfe28753a5e341e" -SRCREV_qtwebchannel = "3e1a553f77d1fc412e13355274aabd504dc91d38" -SRCREV_qtwebengine = "76d917304a447e3b61b5dae6352956789633b2a7" -SRCREV_qtwebengine-chromium = "ef090c47d08c734ae2b3c1db508982aca0f3ee1e" -SRCREV_qtwebsockets = "d070b92a0b8f493bc07f7bbe39787bdee981ed80" -SRCREV_qtwebview = "62091a1d9700758dfe5b2837cccea278aee8c056" +SRCREV_qttranslations = "0dfdbfc977e315a79cbaa42bd70aa84cc7fd982a" +SRCREV_qtvirtualkeyboard = "e2361a1b45706898ce3d38abb03eb597e4059438" +SRCREV_qtwayland = "fa22e8f69c61634a5ce734134083c43e6335d030" +SRCREV_qtwebchannel = "9775a4c1acbe6607983fac198760f1954192f674" +SRCREV_qtwebengine = "65d5a2656ed191248c05a83a22d8b20d1b4174d4" +SRCREV_qtwebengine-chromium = "208e83e1f53f596946304e072ec028866b1bdc3f" +SRCREV_qtwebsockets = "13e6c10ef65d3919f4272dcb4afc41e247e8759b" +SRCREV_qtwebview = "a8417e2aec269c1298ee7abf99b98ea2b8dca435" From fc48fa6316fe6d0666ae9d0c51b472e311bc7c0c Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 4 Oct 2023 13:58:18 +0200 Subject: [PATCH 06/20] Remove old patches from qtwebengine The workaround for long rsp file is an old patch from qt5 times, which should not be needed in qt6 as used toolchains are in-source, therefore created toolchain labels and later rsp files should not embedded absolute paths, but simply use 'build/toolchain/yocto' as this is a location of yocto toochain with-in source tree. The second patch is fixed in 112-based in 29354c7c7de. Task-number: QTBUG-59769 Change-Id: I94a610c4562463f5de3f8bbb29915e05cf40e640 Reviewed-by: Samuli Piippo (cherry picked from commit bdbb28f3624c2df9b9dd0521ac2924378ccb8916) --- recipes-qt/qt6/qtwebengine.inc | 3 - ...rkaround-for-too-long-.rps-file-name.patch | 43 ----------- ...ops-clip-constants-used-with-shift-i.patch | 74 ------------------- 3 files changed, 120 deletions(-) delete mode 100644 recipes-qt/qt6/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch delete mode 100644 recipes-qt/qt6/qtwebengine/chromium/0003-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch diff --git a/recipes-qt/qt6/qtwebengine.inc b/recipes-qt/qt6/qtwebengine.inc index d9c095c..644cdc9 100644 --- a/recipes-qt/qt6/qtwebengine.inc +++ b/recipes-qt/qt6/qtwebengine.inc @@ -36,8 +36,5 @@ SRC_URI += " \ 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 \ - file://chromium/0003-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch;patchdir=src/3rdparty \ " - SRCREV_FORMAT = "qtwebengine_qtwebengine-chromium" diff --git a/recipes-qt/qt6/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch b/recipes-qt/qt6/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch deleted file mode 100644 index 2e2b9b6..0000000 --- a/recipes-qt/qt6/qtwebengine/chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 358e7b51c205521dc9eac8a8cf676412078fe014 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -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 -Upstream-Status: Inappropriate [OE Specific] ---- - 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. diff --git a/recipes-qt/qt6/qtwebengine/chromium/0003-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch b/recipes-qt/qt6/qtwebengine/chromium/0003-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch deleted file mode 100644 index e1c7f56..0000000 --- a/recipes-qt/qt6/qtwebengine/chromium/0003-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 7894d0d905c61200eb2eb3df1eeeb780e72f3e77 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= -Date: Sun, 16 Jul 2023 18:18:02 +0300 -Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift - instructions within inline assembly - -Fixes assembling with binutil as >= 2.41 - -Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/effadce6c756247ea8bae32dc13bb3e6f464f0eb] -Signed-off-by: James Almer ---- - .../ffmpeg/libavcodec/x86/mathops.h | 26 ++++++++++++++++--- - 1 file changed, 23 insertions(+), 3 deletions(-) - -diff --git a/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h b/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h -index 6298f5ed198..ca7e2dffc10 100644 ---- a/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h -+++ b/chromium/third_party/ffmpeg/libavcodec/x86/mathops.h -@@ -35,12 +35,20 @@ - static av_always_inline av_const int MULL(int a, int b, unsigned shift) - { - int rt, dummy; -+ if (__builtin_constant_p(shift)) - __asm__ ( - "imull %3 \n\t" - "shrdl %4, %%edx, %%eax \n\t" - :"=a"(rt), "=d"(dummy) -- :"a"(a), "rm"(b), "ci"((uint8_t)shift) -+ :"a"(a), "rm"(b), "i"(shift & 0x1F) - ); -+ else -+ __asm__ ( -+ "imull %3 \n\t" -+ "shrdl %4, %%edx, %%eax \n\t" -+ :"=a"(rt), "=d"(dummy) -+ :"a"(a), "rm"(b), "c"((uint8_t)shift) -+ ); - return rt; - } - -@@ -113,19 +121,31 @@ __asm__ volatile(\ - // avoid +32 for shift optimization (gcc should do that ...) - #define NEG_SSR32 NEG_SSR32 - static inline int32_t NEG_SSR32( int32_t a, int8_t s){ -+ if (__builtin_constant_p(s)) - __asm__ ("sarl %1, %0\n\t" - : "+r" (a) -- : "ic" ((uint8_t)(-s)) -+ : "i" (-s & 0x1F) - ); -+ else -+ __asm__ ("sarl %1, %0\n\t" -+ : "+r" (a) -+ : "c" ((uint8_t)(-s)) -+ ); - return a; - } - - #define NEG_USR32 NEG_USR32 - static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ -+ if (__builtin_constant_p(s)) - __asm__ ("shrl %1, %0\n\t" - : "+r" (a) -- : "ic" ((uint8_t)(-s)) -+ : "i" (-s & 0x1F) - ); -+ else -+ __asm__ ("shrl %1, %0\n\t" -+ : "+r" (a) -+ : "c" ((uint8_t)(-s)) -+ ); - return a; - } - From d8e05d43de15a9ad52cd69a7b70387ab0cb85f3b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 15 Nov 2023 08:44:08 +0000 Subject: [PATCH 07/20] Revert "protobuf: add workaround for qtgrpc" This reverts commit f00bd7134e1e7b82811f4c10d14ec5d05967f8ae. Fix has been merged to meta-openembedded Fixes: QTBUG-118868 Change-Id: I2d5f03d49e48605dad2bbc0b0c6885fe3f73ef75 Reviewed-by: Mikko Gronoff (cherry picked from commit 44f08284c7e6ef75f1e75980f8d6e99d6788600f) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 334ee207568f8ae4c49f2dfcea91a043ab6ad365) --- recipes-devtools/protobuf/protobuf_%.bbappend | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 recipes-devtools/protobuf/protobuf_%.bbappend diff --git a/recipes-devtools/protobuf/protobuf_%.bbappend b/recipes-devtools/protobuf/protobuf_%.bbappend deleted file mode 100644 index 3394253..0000000 --- a/recipes-devtools/protobuf/protobuf_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# CMake requires binaries to exist in sysroot, even if they have wrong architecture. -SYSROOT_DIRS += "${bindir}" From a39193a4a85d7f5648bc4348913f19c19541375c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 16 Nov 2023 10:52:43 +0000 Subject: [PATCH 08/20] Update submodule refs on 'lts-6.5' in yocto/meta-qt6 Change-Id: Ia693dde1c23b67db570b95bf97539a76b876797a Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 88 +++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index 92cbf9e..b80306f 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -16,53 +16,53 @@ PV = "${QT_VERSION}" SRCREV = "${SRCREV_${QT_MODULE}}" -SRCREV_tqtc-qmlcompilerplus = "c01b73bc91fb41237e12be7e3bae00c0ad098f1d" -SRCREV_tqtc-qtinsighttracker = "5e4b2a184536fe5f2ad7dd548b318bad78a3a8c2" -SRCREV_tqtc-qtvncserver = "c394ab497a261c1f4b9c1694df32b9f93f809986" -SRCREV_qt3d = "fe53113f488eaff1bf54a1faf489b4d2eed6a0ec" +SRCREV_tqtc-qmlcompilerplus = "a81998d76c599c7b98b01dcec02a513c7211aef7" +SRCREV_tqtc-qtinsighttracker = "441c57d8a919272193fa97b48aea3ad599d74ca8" +SRCREV_tqtc-qtvncserver = "115a5fd5186102946a2dff24862f26790a9f102a" +SRCREV_qt3d = "7ba3911c799f60d324331226efa5010d53cf2b5d" SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" -SRCREV_qt5compat = "4b65d3aaa669ca3ebc18f05a48e15357941ac1ab" -SRCREV_qtbase = "6a52727bffbdd83ef33a7d21dd72e10c96a70a11" -SRCREV_qtapplicationmanager = "3c62184e020b3e89018ee064bfbbd1a7d007f6ef" -SRCREV_qtcharts = "4f50e831c8d581d2c47171ba14748922e1c98609" -SRCREV_qtcoap = "676fa1e83ec95419be525f75d9b39ed0cb45854e" -SRCREV_qtconnectivity = "665e1d0c94f6709ee932f715f70357d8195ab5c9" -SRCREV_qtdatavis3d = "a33f86cf766eab893fdd29ab8c5fb324c03a7510" -SRCREV_qtdeclarative = "1101d8035c95fcd72f5e330ae32e6302791b0d2a" -SRCREV_qtdeviceutilities = "8d783aa71cddd7f64a2cfc3a7942063b96dbe92a" -SRCREV_qtgrpc = "c74a3bef71ccd14085235ab057983877c85449dd" -SRCREV_qthttpserver = "4271de351c6b2c8a6810be3d20ceed87c61ac8aa" -SRCREV_qtimageformats = "0e10e3083acf1f3338a8a64544ccdc1357c97525" -SRCREV_qtinterfaceframework = "25cc761246a454d7f108c19a390f5b906096fdd5" -SRCREV_qtlanguageserver = "c0429873acdc8b7990b0005ec939a26df2eb726c" -SRCREV_qtlocation = "20b2f15c4df9d06b32f14a2debbc04a907d798b7" -SRCREV_qtlottie = "10e7722c2e87d4cab767598981602cc03a7d6df7" -SRCREV_qtmqtt = "d6d36370e119ea66ee485089b92fb8ea1eea1320" -SRCREV_qtmultimedia = "c9eb0956fb7e4a7403cdd4cc71d2ad4a54c3a39e" -SRCREV_qtnetworkauth = "3544d473e5f20b61bf5c13e7c4d7704679b0ee96" -SRCREV_qtopcua = "7ad42bb159ab07b49291f82729c836e91603552a" -SRCREV_qtpositioning = "8898c0a38ce094490fb1b126aaa41af716c0a9ea" -SRCREV_qtquick3d = "6cf37a6ce5bc45cc2b7c7cc3de679dfbf21f7065" +SRCREV_qt5compat = "0b49a194c5b498458137e1c2851226eefc6530fe" +SRCREV_qtbase = "83e339b55aeebce3658ad5faf8613b03add499af" +SRCREV_qtapplicationmanager = "4c9acc2df690e94509a041c00f19310b1d1d57b3" +SRCREV_qtcharts = "ee188fbddf542f7fc2914035e1916cea49cbcf80" +SRCREV_qtcoap = "040f9dce00f77309285eb5c0bb63fe5fe38fd86e" +SRCREV_qtconnectivity = "8d65f868aaca87dc237e3321ab011c8ce8822aa3" +SRCREV_qtdatavis3d = "47abf983162e433482c096cbc6d19cffc92deac2" +SRCREV_qtdeclarative = "9a3ae2c1f973895c2bc43417265108a5f32d735e" +SRCREV_qtdeviceutilities = "d2bf1d8e72debceeccba40a403dd54147f776703" +SRCREV_qtgrpc = "7c4bcb98041b608523f164e883bd2e6b5bc8b9c5" +SRCREV_qthttpserver = "310a0e522d49fa88745241168ea4aba7aa277867" +SRCREV_qtimageformats = "4e9f7bcbcd97ceb1a57645a685f64f453c0752fa" +SRCREV_qtinterfaceframework = "763cb5236bf4c6bbd833cd3242b4d61727f519cb" +SRCREV_qtlanguageserver = "d74a935033bcc2ea86de2108262c7a3d4ce6baa4" +SRCREV_qtlocation = "85b59b9a101f4e3c205bf48dcee022e3881e1974" +SRCREV_qtlottie = "d289093d93da1bb85d440f788b820abcd37ad08c" +SRCREV_qtmqtt = "c0d6d09dd228c16dea419c7021e5e0a2d3c46945" +SRCREV_qtmultimedia = "260b164aeb8939157fc5f9efc7ef45f034039d0b" +SRCREV_qtnetworkauth = "5c8252c07b18261209ce491810aa5a2c23f0c276" +SRCREV_qtopcua = "2d2e84d81fb616735b4cbd0027565c57033da886" +SRCREV_qtpositioning = "fa205b6d68d4a0aa5fc036ba830e604cae76c53a" +SRCREV_qtquick3d = "3601aedc2cd4d529dcf9eccfaba03f2946d28233" SRCREV_qtquick3d-assimp = "fd7cd819e9e130385e17e707da31e60b82e787d0" -SRCREV_qtquick3dphysics = "b54c67432bb91705bbc4699d4da71fb75962d04e" +SRCREV_qtquick3dphysics = "fc722bd79574d8680f8b4c06d26d5c91b0dc37d9" SRCREV_qtquickdesigner-components = "0e457477d54b068abc89cf124daedefe0436dd89" -SRCREV_qtquicktimeline = "1ad31c2948010281a193a76cbd10b1b2aa4828bd" -SRCREV_qtremoteobjects = "6fbf6c6cf3f33b348dd0a0cef8e6514f5c2cd9a7" -SRCREV_qtscxml = "4880f4dd04bbfa841aab0166ed9c8ed121dfb492" -SRCREV_qtsensors = "ad7ceaf4468206213ade8a54768dbf762035d283" -SRCREV_qtserialbus = "ff04048f93305f19850c960540ccc1a57a955de9" -SRCREV_qtserialport = "158b185b5d72f9b7bfdd482b40b0b536db85d565" -SRCREV_qtshadertools = "62bcae5489f49edc90e4ed48f153fbad3f07edfe" -SRCREV_qtspeech = "330c33e9548ab59af2684533d2b138705c5d40c5" -SRCREV_qtsvg = "4cf0b9e535101d6fb4cd74dcbf047f0b7239aefc" -SRCREV_qttools = "6a78863534bffbcd0d50adc6ad9cd9f476f3c3aa" +SRCREV_qtquicktimeline = "78886206a06a13fc9dd0b46e0c7d26889edf1cf2" +SRCREV_qtremoteobjects = "ffcef4e35e38244fd79c4c5486661eeb4ac7d5b8" +SRCREV_qtscxml = "268faedf8bba5da3eda4d46604b332f45be44497" +SRCREV_qtsensors = "1cc91fce6ecfd7ce61a2e806e73f02c0f5dead07" +SRCREV_qtserialbus = "15b09f15c621634cc70e93ca357ad309049fdaa1" +SRCREV_qtserialport = "efb68b6518f31f508bd5d40c69f1d26cf06f6ddf" +SRCREV_qtshadertools = "d849c4a189f7d9a96e6448986958ab9818b57b05" +SRCREV_qtspeech = "a49f9040d0bbcff538aec2c5652120505d153e88" +SRCREV_qtsvg = "45704770954e8a6c4449742d4f98ce6c469e7492" +SRCREV_qttools = "2de68d3ce23a035d3a20d408fc28a47fd00a567e" SRCREV_qttools-qlitehtml = "f05f78ef33225823d348ee18f2fa464e95024dd2" SRCREV_qttools-qlitehtml-litehtml = "43af58e8adad70c4f1a0a9235546a246754c1737" -SRCREV_qttranslations = "0dfdbfc977e315a79cbaa42bd70aa84cc7fd982a" -SRCREV_qtvirtualkeyboard = "e2361a1b45706898ce3d38abb03eb597e4059438" -SRCREV_qtwayland = "fa22e8f69c61634a5ce734134083c43e6335d030" -SRCREV_qtwebchannel = "9775a4c1acbe6607983fac198760f1954192f674" -SRCREV_qtwebengine = "65d5a2656ed191248c05a83a22d8b20d1b4174d4" +SRCREV_qttranslations = "1e386d542957fa0877071b4d4e8a905fe41c2c01" +SRCREV_qtvirtualkeyboard = "368645cf5306846d448fb31281d81284a1040b8d" +SRCREV_qtwayland = "c6d70fa9bdd745bc83277d2cff6558ec4aa7da84" +SRCREV_qtwebchannel = "dc4c2d9ed4382556e769b8e03e7c7186a3337d64" +SRCREV_qtwebengine = "7126ed020dbfbc2b411c334a2af1d61f9a7a90a3" SRCREV_qtwebengine-chromium = "208e83e1f53f596946304e072ec028866b1bdc3f" -SRCREV_qtwebsockets = "13e6c10ef65d3919f4272dcb4afc41e247e8759b" -SRCREV_qtwebview = "a8417e2aec269c1298ee7abf99b98ea2b8dca435" +SRCREV_qtwebsockets = "b247625a2af6d049759ca29a872a63ca114c39e2" +SRCREV_qtwebview = "04238096cac78068a68a821cb6da3aaeab65cf9f" From f1e9e2068fa597b1659afec68728dff0cfaafc8c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 13 Nov 2023 08:50:37 +0000 Subject: [PATCH 09/20] coin: add CI build for nanbield Add separate build for nanbield. Update readme for the supported branches. Next Yocto release (scarthgap) will be LTS relase, aim to support it from Qt 6.5 upwards. Change-Id: I37141b4d2a93fc6b276de906dbb7ba60b2733c41 Reviewed-by: Mikko Gronoff (cherry picked from commit 550194a77a5d97eb50852dea372e51c84a444063) (cherry picked from commit 37aefee59547416d4db6586366f61d8e42dd9d54) --- README.md | 1 + coin/module_config.yaml | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d5db30e..5c19b26 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ the LAYERSERIES_COMPAT (c). | Yocto \ Qt | 6.5 | 6.4 | 6.3 | 6.2 | | ---------- |:---:|:---:|:---:|:---:| | master | x | | | | +| nanbield | x | | | | | mickledore | x | x | | | | langdale | c | x | | | | kirkstone | x | x | x | x | diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 214bc50..4b09503 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -17,7 +17,7 @@ machine_type: # # [target1] [target2] [target3] [target4] [target5] # [machine] qemuarm64 qemux86 qemuarm qemux86-64 qemuarm64 -# [yocto] kirkstone master mickledore dunfell master +# [yocto] nanbield master mickledore dunfell kirkstone # [X11] no no yes yes no # [mingw] no yes no no no # [static] no no no no yes @@ -31,7 +31,7 @@ target1: &target1 variableValue: qemuarm64 - type: EnvironmentVariable variableName: MANIFEST - variableValue: kirkstone.xml + variableValue: nanbield.xml - type: EnvironmentVariable variableName: TEST_CONFIGS variableValue: ci configs wayland @@ -95,7 +95,7 @@ target5: &target5 variableValue: qemuarm64 - type: EnvironmentVariable variableName: MANIFEST - variableValue: master.xml + variableValue: kirkstone.xml - type: EnvironmentVariable variableName: TEST_CONFIGS variableValue: ci configs wayland static no-webengine From 10e256ca637f765f067e280ec3eeb356ce706d04 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 1 Nov 2023 12:05:07 +0000 Subject: [PATCH 10/20] qtconnectivity: enable ptest Issues resolved and the tests can be enabled. Change-Id: Ia50bf85c006fef63a65762bd37204f86299e7bf9 Reviewed-by: Mikko Gronoff (cherry picked from commit 51bd35a9f92e2637e8b747de61a6cead73829e32) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 572aa2ea9c386793d15b564d571248bcc65825a1) --- recipes-qt/qt6/qtconnectivity_git.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipes-qt/qt6/qtconnectivity_git.bb b/recipes-qt/qt6/qtconnectivity_git.bb index c621510..9714637 100644 --- a/recipes-qt/qt6/qtconnectivity_git.bb +++ b/recipes-qt/qt6/qtconnectivity_git.bb @@ -15,9 +15,6 @@ 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 qtdeclarative-native" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" From dbf732e054426e375b2eb5b8b5c132b55185eb1a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 15 Nov 2023 10:50:16 +0000 Subject: [PATCH 11/20] qtwebengine: enable ptest Issues resolved and the tests can be enabled. Change-Id: I052259b23b9836e84faa07be9123078b5bdb7d2d Reviewed-by: Mikko Gronoff (cherry picked from commit c5d2c93ba13591c6a941b46a26643dccdc2c1d4e) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit afa26393713f875fff6e7cacf38c7e34fcc5789a) --- recipes-qt/qt6/qtwebengine_git.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes-qt/qt6/qtwebengine_git.bb b/recipes-qt/qt6/qtwebengine_git.bb index d436763..7df8537 100644 --- a/recipes-qt/qt6/qtwebengine_git.bb +++ b/recipes-qt/qt6/qtwebengine_git.bb @@ -83,8 +83,6 @@ FILES:${PN}-tools = "" # when proprietary-codecs is enabled INSANE_SKIP:${PN} += "textrel" -QT_PTEST_ENABLED = "0" - # QTBUG-109565 workaround: Disable GCC -O2 on armv7a-neon due to stack alignment issue FULL_OPTIMIZATION:remove:armv7a = "${@bb.utils.contains('TUNE_FEATURES', 'neon', '-O2', '', d)}" FULL_OPTIMIZATION:append:armv7a = "${@bb.utils.contains('TUNE_FEATURES', 'neon', ' -O1', '', d)}" From 5a99320f43d65207292ce55bcde7ab957db2067f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 15 Nov 2023 13:24:49 +0000 Subject: [PATCH 12/20] qmlcompiler: enable ptest Issues resolved and the tests can be enabled. Change-Id: I8c8c0ad8b9864589ed4248a9157159bb55d26407 Reviewed-by: Mikko Gronoff (cherry picked from commit 3dc62ec47b9b1441ec651382af7cd9a6457048c5) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 635405045c91d6c34cdc098f9e7a5d23d4498c86) --- recipes-qt/qt6/qmlcompilerplus_git.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes-qt/qt6/qmlcompilerplus_git.bb b/recipes-qt/qt6/qmlcompilerplus_git.bb index 468f569..9962008 100644 --- a/recipes-qt/qt6/qmlcompilerplus_git.bb +++ b/recipes-qt/qt6/qmlcompilerplus_git.bb @@ -11,6 +11,4 @@ include recipes-qt/qt6/qt6-commercial.inc DEPENDS += "qtbase qtdeclarative qtdeclarative-native qmlcompilerplus-native" -PTEST_ENABLED = "0" - BBCLASSEXTEND = "native nativesdk" From e9d8dcd1ad69f11663d94ad9beccf152c93152c9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 18 Nov 2023 07:08:17 +0000 Subject: [PATCH 13/20] Update submodule refs on 'lts-6.5' in yocto/meta-qt6 Change-Id: I9a23407e82938a53537f5d0c46c69a68694326f4 Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 90 +++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index b80306f..29644d8 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -16,53 +16,53 @@ PV = "${QT_VERSION}" SRCREV = "${SRCREV_${QT_MODULE}}" -SRCREV_tqtc-qmlcompilerplus = "a81998d76c599c7b98b01dcec02a513c7211aef7" -SRCREV_tqtc-qtinsighttracker = "441c57d8a919272193fa97b48aea3ad599d74ca8" -SRCREV_tqtc-qtvncserver = "115a5fd5186102946a2dff24862f26790a9f102a" -SRCREV_qt3d = "7ba3911c799f60d324331226efa5010d53cf2b5d" +SRCREV_tqtc-qmlcompilerplus = "3f39f5b1e4ac44c96135d32fd5040e99afd67d1c" +SRCREV_tqtc-qtinsighttracker = "faaf1402f37dd6091aff112bf03fc7bc5cc467fe" +SRCREV_tqtc-qtvncserver = "2c521bb41dea43e8ec9e994c83c26c643e06f849" +SRCREV_qt3d = "b4f570bea669fa9caa8fc7975a9cbde32e8c08f3" SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" -SRCREV_qt5compat = "0b49a194c5b498458137e1c2851226eefc6530fe" -SRCREV_qtbase = "83e339b55aeebce3658ad5faf8613b03add499af" -SRCREV_qtapplicationmanager = "4c9acc2df690e94509a041c00f19310b1d1d57b3" -SRCREV_qtcharts = "ee188fbddf542f7fc2914035e1916cea49cbcf80" -SRCREV_qtcoap = "040f9dce00f77309285eb5c0bb63fe5fe38fd86e" -SRCREV_qtconnectivity = "8d65f868aaca87dc237e3321ab011c8ce8822aa3" -SRCREV_qtdatavis3d = "47abf983162e433482c096cbc6d19cffc92deac2" -SRCREV_qtdeclarative = "9a3ae2c1f973895c2bc43417265108a5f32d735e" -SRCREV_qtdeviceutilities = "d2bf1d8e72debceeccba40a403dd54147f776703" -SRCREV_qtgrpc = "7c4bcb98041b608523f164e883bd2e6b5bc8b9c5" -SRCREV_qthttpserver = "310a0e522d49fa88745241168ea4aba7aa277867" -SRCREV_qtimageformats = "4e9f7bcbcd97ceb1a57645a685f64f453c0752fa" -SRCREV_qtinterfaceframework = "763cb5236bf4c6bbd833cd3242b4d61727f519cb" -SRCREV_qtlanguageserver = "d74a935033bcc2ea86de2108262c7a3d4ce6baa4" -SRCREV_qtlocation = "85b59b9a101f4e3c205bf48dcee022e3881e1974" -SRCREV_qtlottie = "d289093d93da1bb85d440f788b820abcd37ad08c" -SRCREV_qtmqtt = "c0d6d09dd228c16dea419c7021e5e0a2d3c46945" -SRCREV_qtmultimedia = "260b164aeb8939157fc5f9efc7ef45f034039d0b" -SRCREV_qtnetworkauth = "5c8252c07b18261209ce491810aa5a2c23f0c276" -SRCREV_qtopcua = "2d2e84d81fb616735b4cbd0027565c57033da886" -SRCREV_qtpositioning = "fa205b6d68d4a0aa5fc036ba830e604cae76c53a" -SRCREV_qtquick3d = "3601aedc2cd4d529dcf9eccfaba03f2946d28233" +SRCREV_qt5compat = "63f8eb91d00afc94dd9deb3f98240ebec11b3fa9" +SRCREV_qtbase = "c6a7c1b5e5235be369ec641fbd79035dc416c5eb" +SRCREV_qtapplicationmanager = "d751e13991a6d89e54d510371ecc0c934d39fb7f" +SRCREV_qtcharts = "ef9e8f3089a1d1f4c8658920e3b3bd6d920630ac" +SRCREV_qtcoap = "b3f676dbe970617883990b3d19cd6292bb80d4d1" +SRCREV_qtconnectivity = "e24fe1b799df8f0781e4ddd811ef3a8f1fe8b8e9" +SRCREV_qtdatavis3d = "f48014bb8ffdebc4ad169326c4ccef812bbcf6cb" +SRCREV_qtdeclarative = "3aa816c2ae596150bf3b44b567880604f9943d87" +SRCREV_qtdeviceutilities = "2397aa12f15076b733c6acb6d12699b54f270d11" +SRCREV_qtgrpc = "9911a7371b47d8de35795ff0f6c3c3bb383edde5" +SRCREV_qthttpserver = "8da195bb49f08160659e2dd6d131fbfc80e19533" +SRCREV_qtimageformats = "140418379dc95d0acd2396e586aa3929886a689b" +SRCREV_qtinterfaceframework = "009f13d417a3a6cc6f3fc2b49c19e26441c563ec" +SRCREV_qtlanguageserver = "2e68461f0dd0f407e0d21f3763901e07919dd1cf" +SRCREV_qtlocation = "4d55af11963dbbc98207e2a022d3427c73aa8bb7" +SRCREV_qtlottie = "9213f7a384f59e91c54ebc248bf9a8ed9581819e" +SRCREV_qtmqtt = "8371edc07a2e156323e24105fde11367f37b108d" +SRCREV_qtmultimedia = "b193af3dd3889ff373e2a796b93f65f659cf086a" +SRCREV_qtnetworkauth = "396c33e276ccd22504128ab4bea1672f3c4dfd91" +SRCREV_qtopcua = "9ceca4a9f58ec9c09cbc0fbb5769835062b8dbfe" +SRCREV_qtpositioning = "889dfa3e05c7bd9adf201faf24df43a14c2350a8" +SRCREV_qtquick3d = "65345271145633e52eed1585c53c43b59bf3a2e1" SRCREV_qtquick3d-assimp = "fd7cd819e9e130385e17e707da31e60b82e787d0" -SRCREV_qtquick3dphysics = "fc722bd79574d8680f8b4c06d26d5c91b0dc37d9" -SRCREV_qtquickdesigner-components = "0e457477d54b068abc89cf124daedefe0436dd89" -SRCREV_qtquicktimeline = "78886206a06a13fc9dd0b46e0c7d26889edf1cf2" -SRCREV_qtremoteobjects = "ffcef4e35e38244fd79c4c5486661eeb4ac7d5b8" -SRCREV_qtscxml = "268faedf8bba5da3eda4d46604b332f45be44497" -SRCREV_qtsensors = "1cc91fce6ecfd7ce61a2e806e73f02c0f5dead07" -SRCREV_qtserialbus = "15b09f15c621634cc70e93ca357ad309049fdaa1" -SRCREV_qtserialport = "efb68b6518f31f508bd5d40c69f1d26cf06f6ddf" -SRCREV_qtshadertools = "d849c4a189f7d9a96e6448986958ab9818b57b05" -SRCREV_qtspeech = "a49f9040d0bbcff538aec2c5652120505d153e88" -SRCREV_qtsvg = "45704770954e8a6c4449742d4f98ce6c469e7492" -SRCREV_qttools = "2de68d3ce23a035d3a20d408fc28a47fd00a567e" +SRCREV_qtquick3dphysics = "b016a32932632b6e15cdb144bb67fe9051b637b7" +SRCREV_qtquickdesigner-components = "55dfd50975935efbe67ea8cdb77ac01e4640db88" +SRCREV_qtquicktimeline = "e40ed6d4db277349c7d36af1038cdd3af0ce9ec9" +SRCREV_qtremoteobjects = "2139a401c26c89068867b2b9ebbf702986364636" +SRCREV_qtscxml = "9921739e2703f38b5ddc2d12abfc4d0dda1df888" +SRCREV_qtsensors = "823cbd25bb28c8c31e9a2971b25abeae3cb22559" +SRCREV_qtserialbus = "c139ad093786f03574557e4367141df4713143b1" +SRCREV_qtserialport = "7d58b2d3c6b3c2ed8f1501e47e3e696088fa5f3f" +SRCREV_qtshadertools = "f3f7876374ccbad1e7b8455d5b7d02ffa85952b1" +SRCREV_qtspeech = "8403d776bcfeb33dfbe751ca8718d6b8688f449e" +SRCREV_qtsvg = "47517b898b13b598d0b121da3c3f833e8bfebc96" +SRCREV_qttools = "c85d88df34bcedd84de8cb2d60db24bb89ad9489" SRCREV_qttools-qlitehtml = "f05f78ef33225823d348ee18f2fa464e95024dd2" SRCREV_qttools-qlitehtml-litehtml = "43af58e8adad70c4f1a0a9235546a246754c1737" -SRCREV_qttranslations = "1e386d542957fa0877071b4d4e8a905fe41c2c01" -SRCREV_qtvirtualkeyboard = "368645cf5306846d448fb31281d81284a1040b8d" -SRCREV_qtwayland = "c6d70fa9bdd745bc83277d2cff6558ec4aa7da84" -SRCREV_qtwebchannel = "dc4c2d9ed4382556e769b8e03e7c7186a3337d64" -SRCREV_qtwebengine = "7126ed020dbfbc2b411c334a2af1d61f9a7a90a3" +SRCREV_qttranslations = "b37854035b26b7615a610676c03719409bdd17a5" +SRCREV_qtvirtualkeyboard = "c94a1a0211851b059ed1691ecd210b07a7ac45f5" +SRCREV_qtwayland = "b69b32de0c5b43875573db29f9dededa537ebad7" +SRCREV_qtwebchannel = "ac306913840b21d37fe05af077a97e5be0e99c34" +SRCREV_qtwebengine = "877f8a10af6364d113d8bd72aca0f6d6aef7cdcb" SRCREV_qtwebengine-chromium = "208e83e1f53f596946304e072ec028866b1bdc3f" -SRCREV_qtwebsockets = "b247625a2af6d049759ca29a872a63ca114c39e2" -SRCREV_qtwebview = "04238096cac78068a68a821cb6da3aaeab65cf9f" +SRCREV_qtwebsockets = "6787442cb8440b802d060c832e6c022ce10f2a47" +SRCREV_qtwebview = "0da718e591cc1be8be1e02a680ef68937f9bc15d" From a163a89da82b6b2d83ef18fda21d7e19fe6b3244 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 20 Nov 2023 16:03:48 +0000 Subject: [PATCH 14/20] Update submodule refs on 'lts-6.5' in yocto/meta-qt6 Change-Id: I8624dd17bc2b902d3ee1f5987869822027362428 Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 88 +++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index 29644d8..fa504fb 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -16,53 +16,53 @@ PV = "${QT_VERSION}" SRCREV = "${SRCREV_${QT_MODULE}}" -SRCREV_tqtc-qmlcompilerplus = "3f39f5b1e4ac44c96135d32fd5040e99afd67d1c" -SRCREV_tqtc-qtinsighttracker = "faaf1402f37dd6091aff112bf03fc7bc5cc467fe" -SRCREV_tqtc-qtvncserver = "2c521bb41dea43e8ec9e994c83c26c643e06f849" -SRCREV_qt3d = "b4f570bea669fa9caa8fc7975a9cbde32e8c08f3" +SRCREV_tqtc-qmlcompilerplus = "53b28520eaf667a41dce21b78aa110f38a74caa7" +SRCREV_tqtc-qtinsighttracker = "bb2db7c8ba1d33c64f31357c96079fe537525bb9" +SRCREV_tqtc-qtvncserver = "3b998940ca84edb46d946563af61376d921b3361" +SRCREV_qt3d = "3090162a285a6d2ec654b89eb0f7ef81505edd08" SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" -SRCREV_qt5compat = "63f8eb91d00afc94dd9deb3f98240ebec11b3fa9" -SRCREV_qtbase = "c6a7c1b5e5235be369ec641fbd79035dc416c5eb" -SRCREV_qtapplicationmanager = "d751e13991a6d89e54d510371ecc0c934d39fb7f" -SRCREV_qtcharts = "ef9e8f3089a1d1f4c8658920e3b3bd6d920630ac" -SRCREV_qtcoap = "b3f676dbe970617883990b3d19cd6292bb80d4d1" -SRCREV_qtconnectivity = "e24fe1b799df8f0781e4ddd811ef3a8f1fe8b8e9" -SRCREV_qtdatavis3d = "f48014bb8ffdebc4ad169326c4ccef812bbcf6cb" -SRCREV_qtdeclarative = "3aa816c2ae596150bf3b44b567880604f9943d87" -SRCREV_qtdeviceutilities = "2397aa12f15076b733c6acb6d12699b54f270d11" -SRCREV_qtgrpc = "9911a7371b47d8de35795ff0f6c3c3bb383edde5" -SRCREV_qthttpserver = "8da195bb49f08160659e2dd6d131fbfc80e19533" -SRCREV_qtimageformats = "140418379dc95d0acd2396e586aa3929886a689b" -SRCREV_qtinterfaceframework = "009f13d417a3a6cc6f3fc2b49c19e26441c563ec" -SRCREV_qtlanguageserver = "2e68461f0dd0f407e0d21f3763901e07919dd1cf" -SRCREV_qtlocation = "4d55af11963dbbc98207e2a022d3427c73aa8bb7" -SRCREV_qtlottie = "9213f7a384f59e91c54ebc248bf9a8ed9581819e" -SRCREV_qtmqtt = "8371edc07a2e156323e24105fde11367f37b108d" -SRCREV_qtmultimedia = "b193af3dd3889ff373e2a796b93f65f659cf086a" -SRCREV_qtnetworkauth = "396c33e276ccd22504128ab4bea1672f3c4dfd91" -SRCREV_qtopcua = "9ceca4a9f58ec9c09cbc0fbb5769835062b8dbfe" -SRCREV_qtpositioning = "889dfa3e05c7bd9adf201faf24df43a14c2350a8" -SRCREV_qtquick3d = "65345271145633e52eed1585c53c43b59bf3a2e1" +SRCREV_qt5compat = "65ae383a0e28d38821ec4938a8f28eef82023bd0" +SRCREV_qtbase = "f7946a35e596b4449c6e54d7468d9b1417b3b0c5" +SRCREV_qtapplicationmanager = "38d193b71d0278ed8b20a6d44e8317ac56a52755" +SRCREV_qtcharts = "cffcaec7ba39d42a4318ff1853c2e941e4f3f4d6" +SRCREV_qtcoap = "a01e43e3e29976802eb089ee0d24202a51d8ecfa" +SRCREV_qtconnectivity = "bf0197a6f665249d99988ffc6c37736da186a1d9" +SRCREV_qtdatavis3d = "d0a3ab519b0b026b5d911cc05a5344625ab2f1a3" +SRCREV_qtdeclarative = "9f2174ae612c3aacf9aaf016f79f4d28e6caeb8b" +SRCREV_qtdeviceutilities = "c9f4a353eef66defe506d8f6f35ec475d2453e36" +SRCREV_qtgrpc = "66664388c9d677c71b4640a07c5c49a9543e94ac" +SRCREV_qthttpserver = "8f5c4317547cb4b209547b89e63c47255354c1a2" +SRCREV_qtimageformats = "3f2933c0e2a05d2afe22dd0644bc1f10cf3b3367" +SRCREV_qtinterfaceframework = "5fef4fb24445a87730ec7ace3407dacf2721dbbc" +SRCREV_qtlanguageserver = "6c021a68277055b2208cb8ca2f5739d02b88bdf5" +SRCREV_qtlocation = "4c7f6430d344abfa19bcd14ec0bd273234407f46" +SRCREV_qtlottie = "61485083d84d672f6102377b4371a3785fe1e597" +SRCREV_qtmqtt = "7d556fad9386d07ee55053cbe8e026c7cfa3a352" +SRCREV_qtmultimedia = "d670064acfa55bf2a5aae091e54fe2ebbe462468" +SRCREV_qtnetworkauth = "8b4382c7f6631664b0c361d581b8569ab89ec52c" +SRCREV_qtopcua = "52c070438c1c3c6fba1bdb9eeb9b8f25ddb769f4" +SRCREV_qtpositioning = "550d031f88f181adaeeeaf17d9b2ea6065327966" +SRCREV_qtquick3d = "1f6c6f74d15d8dab49257e17f4e102f2f0efa0ee" SRCREV_qtquick3d-assimp = "fd7cd819e9e130385e17e707da31e60b82e787d0" -SRCREV_qtquick3dphysics = "b016a32932632b6e15cdb144bb67fe9051b637b7" +SRCREV_qtquick3dphysics = "4b793455a7cd5a9e90ef09dc945dc7298b5cece4" SRCREV_qtquickdesigner-components = "55dfd50975935efbe67ea8cdb77ac01e4640db88" -SRCREV_qtquicktimeline = "e40ed6d4db277349c7d36af1038cdd3af0ce9ec9" -SRCREV_qtremoteobjects = "2139a401c26c89068867b2b9ebbf702986364636" -SRCREV_qtscxml = "9921739e2703f38b5ddc2d12abfc4d0dda1df888" -SRCREV_qtsensors = "823cbd25bb28c8c31e9a2971b25abeae3cb22559" -SRCREV_qtserialbus = "c139ad093786f03574557e4367141df4713143b1" -SRCREV_qtserialport = "7d58b2d3c6b3c2ed8f1501e47e3e696088fa5f3f" -SRCREV_qtshadertools = "f3f7876374ccbad1e7b8455d5b7d02ffa85952b1" -SRCREV_qtspeech = "8403d776bcfeb33dfbe751ca8718d6b8688f449e" -SRCREV_qtsvg = "47517b898b13b598d0b121da3c3f833e8bfebc96" -SRCREV_qttools = "c85d88df34bcedd84de8cb2d60db24bb89ad9489" +SRCREV_qtquicktimeline = "99a0ed87ed7a8a78cd4d53a2734165a7fa5d614d" +SRCREV_qtremoteobjects = "ba529300f860f53db5912f213ee1d3673f427e70" +SRCREV_qtscxml = "e0884fb8105c3481ef1a159d7fec3b54eb51eb62" +SRCREV_qtsensors = "0d189568253202ef3ef36b603eec783c0ee8e307" +SRCREV_qtserialbus = "31ba82813aa414d8914d9f07de3344887fe41cfc" +SRCREV_qtserialport = "00b9d0b4b1e54421dcf3ec9ce79923d9a4d50460" +SRCREV_qtshadertools = "860b8d0d761c25309609a8d0e78267a4b4745b57" +SRCREV_qtspeech = "03584bac8b041c0488b9a68e89af78695abf8890" +SRCREV_qtsvg = "d354a4af005a0519212f28c8119431800728c063" +SRCREV_qttools = "b167aed464a10799cde6d68773687f40cddd7741" SRCREV_qttools-qlitehtml = "f05f78ef33225823d348ee18f2fa464e95024dd2" SRCREV_qttools-qlitehtml-litehtml = "43af58e8adad70c4f1a0a9235546a246754c1737" -SRCREV_qttranslations = "b37854035b26b7615a610676c03719409bdd17a5" -SRCREV_qtvirtualkeyboard = "c94a1a0211851b059ed1691ecd210b07a7ac45f5" -SRCREV_qtwayland = "b69b32de0c5b43875573db29f9dededa537ebad7" -SRCREV_qtwebchannel = "ac306913840b21d37fe05af077a97e5be0e99c34" -SRCREV_qtwebengine = "877f8a10af6364d113d8bd72aca0f6d6aef7cdcb" +SRCREV_qttranslations = "dcafb18ada6beadb2425e74cf60a0d5d81cd6a80" +SRCREV_qtvirtualkeyboard = "d0094f9e805841c83456669fb20479cd013292a4" +SRCREV_qtwayland = "c6b9becbdc171d7851c1ea53185e411c4bbaca31" +SRCREV_qtwebchannel = "8218260bc19a2d9f69ca70de0ab1154ac39883f4" +SRCREV_qtwebengine = "458166040c52f4a509f6e1f55a85a0c39e8d38b8" SRCREV_qtwebengine-chromium = "208e83e1f53f596946304e072ec028866b1bdc3f" -SRCREV_qtwebsockets = "6787442cb8440b802d060c832e6c022ce10f2a47" -SRCREV_qtwebview = "0da718e591cc1be8be1e02a680ef68937f9bc15d" +SRCREV_qtwebsockets = "9b30b04a9a4087432fcf441136c4dc658a82f823" +SRCREV_qtwebview = "a7ac9d905c68a5b20867d65fe95cb5f3ae3e7e68" From bf5089ec4f6148054c7a9b7df4d1f348e1e45cf6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 21 Nov 2023 16:59:55 +0000 Subject: [PATCH 15/20] Update submodule refs on 'lts-6.5' in yocto/meta-qt6 Change-Id: I841fbbf118f6daeab2065bfb870da82be624a998 Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 70 +++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index fa504fb..2420dbe 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -16,53 +16,53 @@ PV = "${QT_VERSION}" SRCREV = "${SRCREV_${QT_MODULE}}" -SRCREV_tqtc-qmlcompilerplus = "53b28520eaf667a41dce21b78aa110f38a74caa7" -SRCREV_tqtc-qtinsighttracker = "bb2db7c8ba1d33c64f31357c96079fe537525bb9" -SRCREV_tqtc-qtvncserver = "3b998940ca84edb46d946563af61376d921b3361" -SRCREV_qt3d = "3090162a285a6d2ec654b89eb0f7ef81505edd08" +SRCREV_tqtc-qmlcompilerplus = "436d8352c9cdd7b58d11b038181c7f7b8f81a0e2" +SRCREV_tqtc-qtinsighttracker = "b349e03fe3b9047e64f18adce26e3e270e8a9f8c" +SRCREV_tqtc-qtvncserver = "d97c9139235232c224494dc833572535ac6fffbd" +SRCREV_qt3d = "d2c4c08ce42bf74673a674f8090fe727e36069ee" SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" -SRCREV_qt5compat = "65ae383a0e28d38821ec4938a8f28eef82023bd0" +SRCREV_qt5compat = "d9564c49473d5e441dd6c9b1735a67a4fa76c3ee" SRCREV_qtbase = "f7946a35e596b4449c6e54d7468d9b1417b3b0c5" -SRCREV_qtapplicationmanager = "38d193b71d0278ed8b20a6d44e8317ac56a52755" -SRCREV_qtcharts = "cffcaec7ba39d42a4318ff1853c2e941e4f3f4d6" +SRCREV_qtapplicationmanager = "90408b119255295b71c025f89549f191f17322ed" +SRCREV_qtcharts = "8a7cc738f8a8a2041f6191b456211e2478b0a9df" SRCREV_qtcoap = "a01e43e3e29976802eb089ee0d24202a51d8ecfa" -SRCREV_qtconnectivity = "bf0197a6f665249d99988ffc6c37736da186a1d9" -SRCREV_qtdatavis3d = "d0a3ab519b0b026b5d911cc05a5344625ab2f1a3" -SRCREV_qtdeclarative = "9f2174ae612c3aacf9aaf016f79f4d28e6caeb8b" -SRCREV_qtdeviceutilities = "c9f4a353eef66defe506d8f6f35ec475d2453e36" -SRCREV_qtgrpc = "66664388c9d677c71b4640a07c5c49a9543e94ac" -SRCREV_qthttpserver = "8f5c4317547cb4b209547b89e63c47255354c1a2" +SRCREV_qtconnectivity = "9d4094c8bc89d95cd9a7d2e38d5444219daad495" +SRCREV_qtdatavis3d = "4c8a37b147e203f3fc52f61f79dd29e744e783b1" +SRCREV_qtdeclarative = "ee05413e7cd7ac293a2e1cad6f6f0c8bd491ead3" +SRCREV_qtdeviceutilities = "e3727dc62e65c3c6843fdb23a3e086698e94a104" +SRCREV_qtgrpc = "da447bb8d2c369fe8042e9c8fece33ef59d73562" +SRCREV_qthttpserver = "375561cc709305b5113cf1dd201eb6040875a843" SRCREV_qtimageformats = "3f2933c0e2a05d2afe22dd0644bc1f10cf3b3367" -SRCREV_qtinterfaceframework = "5fef4fb24445a87730ec7ace3407dacf2721dbbc" +SRCREV_qtinterfaceframework = "5414d37e0f87b5bad23fbe16eaffc5bbee024663" SRCREV_qtlanguageserver = "6c021a68277055b2208cb8ca2f5739d02b88bdf5" -SRCREV_qtlocation = "4c7f6430d344abfa19bcd14ec0bd273234407f46" -SRCREV_qtlottie = "61485083d84d672f6102377b4371a3785fe1e597" -SRCREV_qtmqtt = "7d556fad9386d07ee55053cbe8e026c7cfa3a352" -SRCREV_qtmultimedia = "d670064acfa55bf2a5aae091e54fe2ebbe462468" +SRCREV_qtlocation = "7070a70b187474ef605a5a56939ee87a827b3a85" +SRCREV_qtlottie = "7f931519a7c7323859e015112aa3b1a8eb04e94c" +SRCREV_qtmqtt = "7719dc1c9f323dc7534b5d1db709b987faa068d0" +SRCREV_qtmultimedia = "c2ddc891e88735a1b4e850d6d2f76014f1331a59" SRCREV_qtnetworkauth = "8b4382c7f6631664b0c361d581b8569ab89ec52c" -SRCREV_qtopcua = "52c070438c1c3c6fba1bdb9eeb9b8f25ddb769f4" -SRCREV_qtpositioning = "550d031f88f181adaeeeaf17d9b2ea6065327966" -SRCREV_qtquick3d = "1f6c6f74d15d8dab49257e17f4e102f2f0efa0ee" +SRCREV_qtopcua = "d2f09adb15aab46ed04ca666b72842e19e8a64ea" +SRCREV_qtpositioning = "e9dcd4b9976326bd664182cd6dec1af40720dcc2" +SRCREV_qtquick3d = "02b15e4c42d1244c1e1ee7e531833c0581feb0f6" SRCREV_qtquick3d-assimp = "fd7cd819e9e130385e17e707da31e60b82e787d0" -SRCREV_qtquick3dphysics = "4b793455a7cd5a9e90ef09dc945dc7298b5cece4" +SRCREV_qtquick3dphysics = "9d5093cd7dae711abc31cf9e958d0c0f040691d5" SRCREV_qtquickdesigner-components = "55dfd50975935efbe67ea8cdb77ac01e4640db88" -SRCREV_qtquicktimeline = "99a0ed87ed7a8a78cd4d53a2734165a7fa5d614d" -SRCREV_qtremoteobjects = "ba529300f860f53db5912f213ee1d3673f427e70" -SRCREV_qtscxml = "e0884fb8105c3481ef1a159d7fec3b54eb51eb62" -SRCREV_qtsensors = "0d189568253202ef3ef36b603eec783c0ee8e307" +SRCREV_qtquicktimeline = "62f041180d7078e4eea7577da4186d7280979dfd" +SRCREV_qtremoteobjects = "176f28a8188c96ca3da5b7150be71c10056a5079" +SRCREV_qtscxml = "46530c0a9d2a412fd771de3c472787265f27efe0" +SRCREV_qtsensors = "b73af7d2256747faa7ba2d7851a891cdcfc7d428" SRCREV_qtserialbus = "31ba82813aa414d8914d9f07de3344887fe41cfc" SRCREV_qtserialport = "00b9d0b4b1e54421dcf3ec9ce79923d9a4d50460" SRCREV_qtshadertools = "860b8d0d761c25309609a8d0e78267a4b4745b57" -SRCREV_qtspeech = "03584bac8b041c0488b9a68e89af78695abf8890" +SRCREV_qtspeech = "9257a8ba65264aab8f561c15e8ad088e837d4f4c" SRCREV_qtsvg = "d354a4af005a0519212f28c8119431800728c063" -SRCREV_qttools = "b167aed464a10799cde6d68773687f40cddd7741" +SRCREV_qttools = "ca4eb849251633ea1c17537be250114273438f7d" SRCREV_qttools-qlitehtml = "f05f78ef33225823d348ee18f2fa464e95024dd2" SRCREV_qttools-qlitehtml-litehtml = "43af58e8adad70c4f1a0a9235546a246754c1737" -SRCREV_qttranslations = "dcafb18ada6beadb2425e74cf60a0d5d81cd6a80" -SRCREV_qtvirtualkeyboard = "d0094f9e805841c83456669fb20479cd013292a4" -SRCREV_qtwayland = "c6b9becbdc171d7851c1ea53185e411c4bbaca31" -SRCREV_qtwebchannel = "8218260bc19a2d9f69ca70de0ab1154ac39883f4" -SRCREV_qtwebengine = "458166040c52f4a509f6e1f55a85a0c39e8d38b8" +SRCREV_qttranslations = "78f7b65b51b05989352c4ebd0bc43b8d0b6a3c76" +SRCREV_qtvirtualkeyboard = "448c7d46b88d7cc67209d2ae9aea68d2b65e26fa" +SRCREV_qtwayland = "72208394f649dd2aa2fc0265db96bd27f1877556" +SRCREV_qtwebchannel = "fa43d7aa1a01e3a83fba099c95300a5428156f0b" +SRCREV_qtwebengine = "8bc4ecb60808b148cd9c7bb5705b1c2810134ce5" SRCREV_qtwebengine-chromium = "208e83e1f53f596946304e072ec028866b1bdc3f" -SRCREV_qtwebsockets = "9b30b04a9a4087432fcf441136c4dc658a82f823" -SRCREV_qtwebview = "a7ac9d905c68a5b20867d65fe95cb5f3ae3e7e68" +SRCREV_qtwebsockets = "e6724a76443a71896d6b1bf00c35eef1ad0e07e9" +SRCREV_qtwebview = "f10564c583f0aa7ec7d1467d7e0a5fb2f5bff545" From 31c26c845c6c59dadd88a7c294e901961a978ceb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 29 Nov 2023 07:50:29 +0000 Subject: [PATCH 16/20] Update submodule refs on 'lts-6.5.4' in yocto/meta-qt6 Change-Id: Ib828c0f7226b0e1f167ce7a358afab8ab30e28e0 Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 92 +++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index 2420dbe..8872e93 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -16,53 +16,53 @@ PV = "${QT_VERSION}" SRCREV = "${SRCREV_${QT_MODULE}}" -SRCREV_tqtc-qmlcompilerplus = "436d8352c9cdd7b58d11b038181c7f7b8f81a0e2" -SRCREV_tqtc-qtinsighttracker = "b349e03fe3b9047e64f18adce26e3e270e8a9f8c" -SRCREV_tqtc-qtvncserver = "d97c9139235232c224494dc833572535ac6fffbd" -SRCREV_qt3d = "d2c4c08ce42bf74673a674f8090fe727e36069ee" -SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" -SRCREV_qt5compat = "d9564c49473d5e441dd6c9b1735a67a4fa76c3ee" -SRCREV_qtbase = "f7946a35e596b4449c6e54d7468d9b1417b3b0c5" -SRCREV_qtapplicationmanager = "90408b119255295b71c025f89549f191f17322ed" -SRCREV_qtcharts = "8a7cc738f8a8a2041f6191b456211e2478b0a9df" -SRCREV_qtcoap = "a01e43e3e29976802eb089ee0d24202a51d8ecfa" -SRCREV_qtconnectivity = "9d4094c8bc89d95cd9a7d2e38d5444219daad495" -SRCREV_qtdatavis3d = "4c8a37b147e203f3fc52f61f79dd29e744e783b1" -SRCREV_qtdeclarative = "ee05413e7cd7ac293a2e1cad6f6f0c8bd491ead3" -SRCREV_qtdeviceutilities = "e3727dc62e65c3c6843fdb23a3e086698e94a104" -SRCREV_qtgrpc = "da447bb8d2c369fe8042e9c8fece33ef59d73562" -SRCREV_qthttpserver = "375561cc709305b5113cf1dd201eb6040875a843" -SRCREV_qtimageformats = "3f2933c0e2a05d2afe22dd0644bc1f10cf3b3367" -SRCREV_qtinterfaceframework = "5414d37e0f87b5bad23fbe16eaffc5bbee024663" -SRCREV_qtlanguageserver = "6c021a68277055b2208cb8ca2f5739d02b88bdf5" -SRCREV_qtlocation = "7070a70b187474ef605a5a56939ee87a827b3a85" -SRCREV_qtlottie = "7f931519a7c7323859e015112aa3b1a8eb04e94c" -SRCREV_qtmqtt = "7719dc1c9f323dc7534b5d1db709b987faa068d0" -SRCREV_qtmultimedia = "c2ddc891e88735a1b4e850d6d2f76014f1331a59" -SRCREV_qtnetworkauth = "8b4382c7f6631664b0c361d581b8569ab89ec52c" -SRCREV_qtopcua = "d2f09adb15aab46ed04ca666b72842e19e8a64ea" -SRCREV_qtpositioning = "e9dcd4b9976326bd664182cd6dec1af40720dcc2" -SRCREV_qtquick3d = "02b15e4c42d1244c1e1ee7e531833c0581feb0f6" +SRCREV_tqtc-qmlcompilerplus = "70987c09a7a3cb1c3b57ed86ad5634cb1586f49b" +SRCREV_tqtc-qtinsighttracker = "13a01aa096a296f7935121a4a4ef3263d697e561" +SRCREV_tqtc-qtvncserver = "e9f53c523523f4c2a721a8aea95555a32e94727e" +SRCREV_qt3d = "7e0168ed5ecbdf23c375b5f9846dcd70b3ae0b97" +SRCREV_qt3d-assimp = "c60a259fd35f09b8896b2920d48c436145914aae" +SRCREV_qt5compat = "c14564eaddf45f104b9f4cbaa5fae7a0e3c22508" +SRCREV_qtbase = "6ce067cffaf983cf1f19285b290374e088a44160" +SRCREV_qtapplicationmanager = "82ac5cdb83835101ef2e3cb70959a23aef2c254f" +SRCREV_qtcharts = "51b874faf9cd1a8c3b3971ed9647a12a33d79c45" +SRCREV_qtcoap = "1170a4db0c26ef47e07ea8b9545ea0c392235e9b" +SRCREV_qtconnectivity = "123bb76635312081ddabeb7e493997892ffecfc5" +SRCREV_qtdatavis3d = "6a489037dfb53a1c8e4933bd17402d8382f3c7c2" +SRCREV_qtdeclarative = "c77b4e19412e16675f41ff3975ecc59242225f25" +SRCREV_qtdeviceutilities = "2b2166e7350b483c8df8e7d5583f921e1e78887c" +SRCREV_qtgrpc = "9c8b1736e4e0a0bea5570308246da07323a8c580" +SRCREV_qthttpserver = "e8d3b9073b42b30b3505ef885a055fb4c851e364" +SRCREV_qtimageformats = "dfc7cbd7d67084b8a646575eb77505e514f7e738" +SRCREV_qtinterfaceframework = "f2ec653c23a06c8604baa52dd970c533d710891d" +SRCREV_qtlanguageserver = "7a9329ec4882463c11f226b3dc252acc8dac4d12" +SRCREV_qtlocation = "a5642d4a16d5cc6913c841bbe8c4d1d793e6349b" +SRCREV_qtlottie = "2ff3d870e401ad942bc5396eb0584a656437bef9" +SRCREV_qtmqtt = "dbd5e4ef5c219ab30d67bda19b0bcd419888431c" +SRCREV_qtmultimedia = "707a28341ebb302e30aaa974c7c2f9438641c94b" +SRCREV_qtnetworkauth = "29c278bdb7b6fa1b46d5dad0ac97b4d3f492187a" +SRCREV_qtopcua = "54c63d34249cb0c3e854ff2a4a2420bf078a0b4a" +SRCREV_qtpositioning = "6bd8a47619e16c9b09099c10f754ad28a1c35912" +SRCREV_qtquick3d = "e749a850eb69a7e06ba7b4ab7631f604dc4cfa0e" SRCREV_qtquick3d-assimp = "fd7cd819e9e130385e17e707da31e60b82e787d0" -SRCREV_qtquick3dphysics = "9d5093cd7dae711abc31cf9e958d0c0f040691d5" -SRCREV_qtquickdesigner-components = "55dfd50975935efbe67ea8cdb77ac01e4640db88" -SRCREV_qtquicktimeline = "62f041180d7078e4eea7577da4186d7280979dfd" -SRCREV_qtremoteobjects = "176f28a8188c96ca3da5b7150be71c10056a5079" -SRCREV_qtscxml = "46530c0a9d2a412fd771de3c472787265f27efe0" -SRCREV_qtsensors = "b73af7d2256747faa7ba2d7851a891cdcfc7d428" -SRCREV_qtserialbus = "31ba82813aa414d8914d9f07de3344887fe41cfc" -SRCREV_qtserialport = "00b9d0b4b1e54421dcf3ec9ce79923d9a4d50460" -SRCREV_qtshadertools = "860b8d0d761c25309609a8d0e78267a4b4745b57" -SRCREV_qtspeech = "9257a8ba65264aab8f561c15e8ad088e837d4f4c" -SRCREV_qtsvg = "d354a4af005a0519212f28c8119431800728c063" -SRCREV_qttools = "ca4eb849251633ea1c17537be250114273438f7d" +SRCREV_qtquick3dphysics = "470b298cdc80290dc8869116a9960528e10c7d36" +SRCREV_qtquickdesigner-components = "5736952b4b0c8aab4ae56b622ea9a53ae718b60a" +SRCREV_qtquicktimeline = "cae134512aa6d667aaa62b7583a2b4db626ea9ca" +SRCREV_qtremoteobjects = "e64b42081a8b5f2ced39408e92fc357d519e5374" +SRCREV_qtscxml = "f222cd19257613c6ee6e6d2e31b63dab21d09286" +SRCREV_qtsensors = "4fc9fca732ea772b1f9c07d4dfa26e31eac9c8d8" +SRCREV_qtserialbus = "00e8df91c4de94995cc61e0718f994cffda20b8a" +SRCREV_qtserialport = "7a3fe17aef7c866dff44a3097965c0c581553458" +SRCREV_qtshadertools = "5a7a16ada93f8b37ee7c1c0cedb9ecc3c4915e05" +SRCREV_qtspeech = "d8ca5b2f826878e63cd40780bcfa678d711da6aa" +SRCREV_qtsvg = "813889c8c868a9ccb29ac077dbc1481af5f2cf19" +SRCREV_qttools = "5f989c26e38559ccce34e8655fa8fd814f243427" SRCREV_qttools-qlitehtml = "f05f78ef33225823d348ee18f2fa464e95024dd2" SRCREV_qttools-qlitehtml-litehtml = "43af58e8adad70c4f1a0a9235546a246754c1737" -SRCREV_qttranslations = "78f7b65b51b05989352c4ebd0bc43b8d0b6a3c76" -SRCREV_qtvirtualkeyboard = "448c7d46b88d7cc67209d2ae9aea68d2b65e26fa" -SRCREV_qtwayland = "72208394f649dd2aa2fc0265db96bd27f1877556" -SRCREV_qtwebchannel = "fa43d7aa1a01e3a83fba099c95300a5428156f0b" -SRCREV_qtwebengine = "8bc4ecb60808b148cd9c7bb5705b1c2810134ce5" +SRCREV_qttranslations = "6c1c6ddf1f41a13f9b965a0cb1035bfad9d60586" +SRCREV_qtvirtualkeyboard = "9e651a6ca073dc2b9664b101a492827366736ea6" +SRCREV_qtwayland = "a3ac04405f5e9279998f3e87346a6838f91e0630" +SRCREV_qtwebchannel = "5e071930cd98d29c5b308f97719040139291b46a" +SRCREV_qtwebengine = "f76cc9742548886b632cef60fda32ca1a87344a6" SRCREV_qtwebengine-chromium = "208e83e1f53f596946304e072ec028866b1bdc3f" -SRCREV_qtwebsockets = "e6724a76443a71896d6b1bf00c35eef1ad0e07e9" -SRCREV_qtwebview = "f10564c583f0aa7ec7d1467d7e0a5fb2f5bff545" +SRCREV_qtwebsockets = "f94cb9a91e91b0f1a3b7d0e7cb69a3e1521254df" +SRCREV_qtwebview = "6cadd647b3108b659c375cd98da7d424a6cfaf69" From b970704dfc875774a6bd5ce1d7364e2c3a245f5c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 17 Nov 2023 08:05:13 +0000 Subject: [PATCH 17/20] qt3d: remove upstreamed patch Assimp is now updated to version that has the patch applied. Change-Id: Ib33974d44ada36f79d73f81689fb91cd6d94a355 Reviewed-by: Mikko Gronoff (cherry picked from commit ac543555896741e18468b28351c102d072a64003) (cherry picked from commit 4945d1e9944f285060ffe6b15913560c95ff76f2) --- ...uint32_t-everywhere-in-FBXBinaryToke.patch | 27 ------------------- recipes-qt/qt6/qt3d_git.bb | 1 - 2 files changed, 28 deletions(-) delete mode 100644 recipes-qt/qt6/qt3d/0001-Use-unqualified-uint32_t-everywhere-in-FBXBinaryToke.patch diff --git a/recipes-qt/qt6/qt3d/0001-Use-unqualified-uint32_t-everywhere-in-FBXBinaryToke.patch b/recipes-qt/qt6/qt3d/0001-Use-unqualified-uint32_t-everywhere-in-FBXBinaryToke.patch deleted file mode 100644 index ea7fc06..0000000 --- a/recipes-qt/qt6/qt3d/0001-Use-unqualified-uint32_t-everywhere-in-FBXBinaryToke.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6e377e36c9cab72b858f4149aed88e2090d9ff4d Mon Sep 17 00:00:00 2001 -From: Ville Voutilainen -Date: Tue, 9 Aug 2022 01:51:30 +0300 -Subject: [PATCH] Use unqualified uint32_t everywhere in FBXBinaryTokenizer - -The use of qualified std::uint32_t requires including instead -of on some implementations, and that breaks the build of Qt 6 -on GCC 13. Just use the unqualified name everywhere. ---- -Upstream-Status: Backport [v5.2.5 commit 253f8bfa621a9fa6cd2c36291cdaa8c60c99322c] - - code/AssetLib/FBX/FBXBinaryTokenizer.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/code/AssetLib/FBX/FBXBinaryTokenizer.cpp b/code/AssetLib/FBX/FBXBinaryTokenizer.cpp -index 348812054..120e47a76 100644 ---- a/code/AssetLib/FBX/FBXBinaryTokenizer.cpp -+++ b/code/AssetLib/FBX/FBXBinaryTokenizer.cpp -@@ -472,7 +472,7 @@ void TokenizeBinary(TokenList& output_tokens, const char* input, size_t length) - } - catch (const DeadlyImportError& e) - { -- if (!is64bits && (length > std::numeric_limits::max())) { -+ if (!is64bits && (length > std::numeric_limits::max())) { - throw DeadlyImportError("The FBX file is invalid. This may be because the content is too big for this older version (", ai_to_string(version), ") of the FBX format. (", e.what(), ")"); - } - throw; diff --git a/recipes-qt/qt6/qt3d_git.bb b/recipes-qt/qt6/qt3d_git.bb index 5903e9d..13b83ec 100644 --- a/recipes-qt/qt6/qt3d_git.bb +++ b/recipes-qt/qt6/qt3d_git.bb @@ -26,7 +26,6 @@ ASSIMP_BRANCH = "qt6_assimp" SRC_URI += " \ ${QT_GIT}/${QT_GIT_PROJECT}/qtquick3d-assimp.git;name=qt3d-assimp;branch=${ASSIMP_BRANCH};protocol=${QT_GIT_PROTOCOL};destsuffix=git/src/3rdparty/assimp/src \ - file://0001-Use-unqualified-uint32_t-everywhere-in-FBXBinaryToke.patch;patchdir=src/3rdparty/assimp/src \ " DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtshadertools qtshadertools-native" From 7756310791d7e2105b76ffb23598f6399c004026 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 30 Nov 2023 14:07:05 +0000 Subject: [PATCH 18/20] Update submodule refs on 'lts-6.5.4' in yocto/meta-qt6 Change-Id: I40377230f1beb3893dd4e4ee7f9c322f4b70c882 Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index 8872e93..f84ebc0 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -62,7 +62,7 @@ SRCREV_qttranslations = "6c1c6ddf1f41a13f9b965a0cb1035bfad9d60586" SRCREV_qtvirtualkeyboard = "9e651a6ca073dc2b9664b101a492827366736ea6" SRCREV_qtwayland = "a3ac04405f5e9279998f3e87346a6838f91e0630" SRCREV_qtwebchannel = "5e071930cd98d29c5b308f97719040139291b46a" -SRCREV_qtwebengine = "f76cc9742548886b632cef60fda32ca1a87344a6" -SRCREV_qtwebengine-chromium = "208e83e1f53f596946304e072ec028866b1bdc3f" +SRCREV_qtwebengine = "55e9dd67ed2cf2546887c0324dc9911756b86a04" +SRCREV_qtwebengine-chromium = "21bb29b9b730cc215ee7dfb3cf343139a9be9522" SRCREV_qtwebsockets = "f94cb9a91e91b0f1a3b7d0e7cb69a3e1521254df" -SRCREV_qtwebview = "6cadd647b3108b659c375cd98da7d424a6cfaf69" +SRCREV_qtwebview = "391202ebbd70a16a1786ac59a1d7d2312a5503e1" From 26829535bc74c402028ec4a27519d4aee9a9e6cf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 14 Dec 2023 23:57:09 +0000 Subject: [PATCH 19/20] Update submodule refs on 'lts-6.5.4' in yocto/meta-qt6 Change-Id: I13bd191c8cd94f3451154fc5ad16f52d7fac264b Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 88 +++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index f84ebc0..95e2356 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -16,53 +16,53 @@ PV = "${QT_VERSION}" SRCREV = "${SRCREV_${QT_MODULE}}" -SRCREV_tqtc-qmlcompilerplus = "70987c09a7a3cb1c3b57ed86ad5634cb1586f49b" -SRCREV_tqtc-qtinsighttracker = "13a01aa096a296f7935121a4a4ef3263d697e561" -SRCREV_tqtc-qtvncserver = "e9f53c523523f4c2a721a8aea95555a32e94727e" -SRCREV_qt3d = "7e0168ed5ecbdf23c375b5f9846dcd70b3ae0b97" +SRCREV_tqtc-qmlcompilerplus = "b9381ca94912003c510b00e4a569262c7710fbc8" +SRCREV_tqtc-qtinsighttracker = "ba99776832c1e083f076bc0e0885d7c873d6c5c9" +SRCREV_tqtc-qtvncserver = "595df7f9f69d663d1590fbf4244cd2be937440b7" +SRCREV_qt3d = "d2e17d09bf57dea873b12062ef18b4b5c1e11bba" SRCREV_qt3d-assimp = "c60a259fd35f09b8896b2920d48c436145914aae" -SRCREV_qt5compat = "c14564eaddf45f104b9f4cbaa5fae7a0e3c22508" -SRCREV_qtbase = "6ce067cffaf983cf1f19285b290374e088a44160" -SRCREV_qtapplicationmanager = "82ac5cdb83835101ef2e3cb70959a23aef2c254f" -SRCREV_qtcharts = "51b874faf9cd1a8c3b3971ed9647a12a33d79c45" -SRCREV_qtcoap = "1170a4db0c26ef47e07ea8b9545ea0c392235e9b" -SRCREV_qtconnectivity = "123bb76635312081ddabeb7e493997892ffecfc5" -SRCREV_qtdatavis3d = "6a489037dfb53a1c8e4933bd17402d8382f3c7c2" -SRCREV_qtdeclarative = "c77b4e19412e16675f41ff3975ecc59242225f25" -SRCREV_qtdeviceutilities = "2b2166e7350b483c8df8e7d5583f921e1e78887c" -SRCREV_qtgrpc = "9c8b1736e4e0a0bea5570308246da07323a8c580" -SRCREV_qthttpserver = "e8d3b9073b42b30b3505ef885a055fb4c851e364" -SRCREV_qtimageformats = "dfc7cbd7d67084b8a646575eb77505e514f7e738" -SRCREV_qtinterfaceframework = "f2ec653c23a06c8604baa52dd970c533d710891d" -SRCREV_qtlanguageserver = "7a9329ec4882463c11f226b3dc252acc8dac4d12" -SRCREV_qtlocation = "a5642d4a16d5cc6913c841bbe8c4d1d793e6349b" -SRCREV_qtlottie = "2ff3d870e401ad942bc5396eb0584a656437bef9" -SRCREV_qtmqtt = "dbd5e4ef5c219ab30d67bda19b0bcd419888431c" -SRCREV_qtmultimedia = "707a28341ebb302e30aaa974c7c2f9438641c94b" -SRCREV_qtnetworkauth = "29c278bdb7b6fa1b46d5dad0ac97b4d3f492187a" -SRCREV_qtopcua = "54c63d34249cb0c3e854ff2a4a2420bf078a0b4a" -SRCREV_qtpositioning = "6bd8a47619e16c9b09099c10f754ad28a1c35912" -SRCREV_qtquick3d = "e749a850eb69a7e06ba7b4ab7631f604dc4cfa0e" +SRCREV_qt5compat = "cb41883f744589e292a60fe8b0cd97f849dc3407" +SRCREV_qtbase = "ffb7d2e3205cc75337ba9ed93d12222e27c3abc1" +SRCREV_qtapplicationmanager = "0e7935e715fceb7c8a29d3b5784196d56556ef61" +SRCREV_qtcharts = "810e5002b8b95e3564c47aef880106082477e297" +SRCREV_qtcoap = "7a5f015cba8db0f52e1d69e66890160b5e2afe5f" +SRCREV_qtconnectivity = "f659a241edf7e60289c7b48b274ef79c304687e1" +SRCREV_qtdatavis3d = "e1cd208356d3ed74997df08d6988d2d9f9b9f5fe" +SRCREV_qtdeclarative = "6fdd37b851d34b5e900b759b3d50256cdce96775" +SRCREV_qtdeviceutilities = "1eecfe3664f8e671a5450328c44f915b60fc0422" +SRCREV_qtgrpc = "64a6f1176f50a3126959e7f54e94d6a8eec5c8fb" +SRCREV_qthttpserver = "db2bb01ca098118fb8840e159653bcf50f4829f8" +SRCREV_qtimageformats = "bb98eaec200ba3e8a1cc2cfb263ec6722b53bca2" +SRCREV_qtinterfaceframework = "e2d1ce3be9d3dd3dfa2bde8c447f77f030a08d3f" +SRCREV_qtlanguageserver = "06e9979471bc60e3859293a20dd421e3faa3deec" +SRCREV_qtlocation = "91e82bb67fc9d0d51b5686774628689313df9187" +SRCREV_qtlottie = "ed98da4eb5cbdfdfec45866645e2cc9d09952cca" +SRCREV_qtmqtt = "c16c07a4a1f74ead89d7b1ef80edfa4f56dbe146" +SRCREV_qtmultimedia = "3f04722c785ee299e1cae62049221c1bb5c4a93f" +SRCREV_qtnetworkauth = "ca2525dd89a50354ee05efde37daba4085b152b5" +SRCREV_qtopcua = "fa8b9c52be016f846a0fea204afb820ec719cdef" +SRCREV_qtpositioning = "10f696422d680e29afd01eaf03ef7ec6de178995" +SRCREV_qtquick3d = "ecbaa16e36f08b74a3a91a33137cb2a29b76058e" SRCREV_qtquick3d-assimp = "fd7cd819e9e130385e17e707da31e60b82e787d0" -SRCREV_qtquick3dphysics = "470b298cdc80290dc8869116a9960528e10c7d36" +SRCREV_qtquick3dphysics = "a63d467705186277c1b8edaffc1282f93687e1fc" SRCREV_qtquickdesigner-components = "5736952b4b0c8aab4ae56b622ea9a53ae718b60a" -SRCREV_qtquicktimeline = "cae134512aa6d667aaa62b7583a2b4db626ea9ca" -SRCREV_qtremoteobjects = "e64b42081a8b5f2ced39408e92fc357d519e5374" -SRCREV_qtscxml = "f222cd19257613c6ee6e6d2e31b63dab21d09286" -SRCREV_qtsensors = "4fc9fca732ea772b1f9c07d4dfa26e31eac9c8d8" -SRCREV_qtserialbus = "00e8df91c4de94995cc61e0718f994cffda20b8a" -SRCREV_qtserialport = "7a3fe17aef7c866dff44a3097965c0c581553458" -SRCREV_qtshadertools = "5a7a16ada93f8b37ee7c1c0cedb9ecc3c4915e05" -SRCREV_qtspeech = "d8ca5b2f826878e63cd40780bcfa678d711da6aa" -SRCREV_qtsvg = "813889c8c868a9ccb29ac077dbc1481af5f2cf19" -SRCREV_qttools = "5f989c26e38559ccce34e8655fa8fd814f243427" +SRCREV_qtquicktimeline = "cc97765c3ef20c11ebde35249a2083f9b2ebdf33" +SRCREV_qtremoteobjects = "4c7d60d8d1dd714e9878f8f7af0128dfea8b8d20" +SRCREV_qtscxml = "9a04f056e4b28b938359bbb06d703e89d80c49ae" +SRCREV_qtsensors = "97c14751f6853a36827b5e5c5d5747fe9be997fe" +SRCREV_qtserialbus = "6311f1c104dd1e9dcd63469f35acd8986864bc10" +SRCREV_qtserialport = "5e51689c6b90206197ad8ad4ad51d5f656baa0c4" +SRCREV_qtshadertools = "4ee1621c0a52320c9ce12bca3b29e6bd34d9bc64" +SRCREV_qtspeech = "e6edec352e3a89d3c1243b6a07da2dee52efba40" +SRCREV_qtsvg = "4a3177bfdb065a1b13793e8e522c73ca5c0bf927" +SRCREV_qttools = "f6ac15c88c8d7f2cbaf821d2a642db46c92435ea" SRCREV_qttools-qlitehtml = "f05f78ef33225823d348ee18f2fa464e95024dd2" SRCREV_qttools-qlitehtml-litehtml = "43af58e8adad70c4f1a0a9235546a246754c1737" -SRCREV_qttranslations = "6c1c6ddf1f41a13f9b965a0cb1035bfad9d60586" -SRCREV_qtvirtualkeyboard = "9e651a6ca073dc2b9664b101a492827366736ea6" -SRCREV_qtwayland = "a3ac04405f5e9279998f3e87346a6838f91e0630" -SRCREV_qtwebchannel = "5e071930cd98d29c5b308f97719040139291b46a" -SRCREV_qtwebengine = "55e9dd67ed2cf2546887c0324dc9911756b86a04" +SRCREV_qttranslations = "abfe9aa2c0e8db8bf5d019938a3b1e43b9d739b6" +SRCREV_qtvirtualkeyboard = "d09d583483713f13bbbcd9a9b8f169f0954403bd" +SRCREV_qtwayland = "726d7c529d5e0ff4fb46e9137d13559642e50f52" +SRCREV_qtwebchannel = "4670dd47f3ad1e746965977246a268c8525fa9a9" +SRCREV_qtwebengine = "1874134e38537d4fb1d6c681c5e5778e65593556" SRCREV_qtwebengine-chromium = "21bb29b9b730cc215ee7dfb3cf343139a9be9522" -SRCREV_qtwebsockets = "f94cb9a91e91b0f1a3b7d0e7cb69a3e1521254df" -SRCREV_qtwebview = "391202ebbd70a16a1786ac59a1d7d2312a5503e1" +SRCREV_qtwebsockets = "88ef1a480fc6d91c1e71dd888326fbf0411cb31a" +SRCREV_qtwebview = "3de606af8fcda9ebe09e3d6d1605267f3523369e" From 46a5edecebba868354d300644775c0500dab275f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 20 Dec 2023 20:17:12 +0000 Subject: [PATCH 20/20] Update submodule refs on 'lts-6.5.4' in yocto/meta-qt6 Change-Id: I73e4571af5ebe88f4c92b03aaf6f10d5475200bb Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 88 +++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index 95e2356..c7860fb 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -16,53 +16,53 @@ PV = "${QT_VERSION}" SRCREV = "${SRCREV_${QT_MODULE}}" -SRCREV_tqtc-qmlcompilerplus = "b9381ca94912003c510b00e4a569262c7710fbc8" -SRCREV_tqtc-qtinsighttracker = "ba99776832c1e083f076bc0e0885d7c873d6c5c9" -SRCREV_tqtc-qtvncserver = "595df7f9f69d663d1590fbf4244cd2be937440b7" -SRCREV_qt3d = "d2e17d09bf57dea873b12062ef18b4b5c1e11bba" +SRCREV_tqtc-qmlcompilerplus = "5199c5da2f70315d055713650e3c3367a546afc7" +SRCREV_tqtc-qtinsighttracker = "8ffb18a8f3d0a267b847556be223890fa4078677" +SRCREV_tqtc-qtvncserver = "118df2b225877cebe35c3b240cf208c64073815a" +SRCREV_qt3d = "1b618897b64af230687486e6d02a9744362e1dd5" SRCREV_qt3d-assimp = "c60a259fd35f09b8896b2920d48c436145914aae" -SRCREV_qt5compat = "cb41883f744589e292a60fe8b0cd97f849dc3407" -SRCREV_qtbase = "ffb7d2e3205cc75337ba9ed93d12222e27c3abc1" -SRCREV_qtapplicationmanager = "0e7935e715fceb7c8a29d3b5784196d56556ef61" -SRCREV_qtcharts = "810e5002b8b95e3564c47aef880106082477e297" -SRCREV_qtcoap = "7a5f015cba8db0f52e1d69e66890160b5e2afe5f" -SRCREV_qtconnectivity = "f659a241edf7e60289c7b48b274ef79c304687e1" -SRCREV_qtdatavis3d = "e1cd208356d3ed74997df08d6988d2d9f9b9f5fe" -SRCREV_qtdeclarative = "6fdd37b851d34b5e900b759b3d50256cdce96775" -SRCREV_qtdeviceutilities = "1eecfe3664f8e671a5450328c44f915b60fc0422" -SRCREV_qtgrpc = "64a6f1176f50a3126959e7f54e94d6a8eec5c8fb" -SRCREV_qthttpserver = "db2bb01ca098118fb8840e159653bcf50f4829f8" -SRCREV_qtimageformats = "bb98eaec200ba3e8a1cc2cfb263ec6722b53bca2" -SRCREV_qtinterfaceframework = "e2d1ce3be9d3dd3dfa2bde8c447f77f030a08d3f" -SRCREV_qtlanguageserver = "06e9979471bc60e3859293a20dd421e3faa3deec" -SRCREV_qtlocation = "91e82bb67fc9d0d51b5686774628689313df9187" -SRCREV_qtlottie = "ed98da4eb5cbdfdfec45866645e2cc9d09952cca" -SRCREV_qtmqtt = "c16c07a4a1f74ead89d7b1ef80edfa4f56dbe146" -SRCREV_qtmultimedia = "3f04722c785ee299e1cae62049221c1bb5c4a93f" -SRCREV_qtnetworkauth = "ca2525dd89a50354ee05efde37daba4085b152b5" -SRCREV_qtopcua = "fa8b9c52be016f846a0fea204afb820ec719cdef" -SRCREV_qtpositioning = "10f696422d680e29afd01eaf03ef7ec6de178995" -SRCREV_qtquick3d = "ecbaa16e36f08b74a3a91a33137cb2a29b76058e" +SRCREV_qt5compat = "f9a7836d2830503c17560226c775fa212a0679d9" +SRCREV_qtbase = "4a727c376366e74520cf751de81052dae7b18782" +SRCREV_qtapplicationmanager = "5afc7275471245e66a3a7168c54359a414e3c714" +SRCREV_qtcharts = "33e70b05cd4bc33c6c68edf2d63b9e0aadc92a06" +SRCREV_qtcoap = "1a539f6718dd2f1baf554faa633809c9136ec88d" +SRCREV_qtconnectivity = "7ea679d1be0f581090ae1f0d5f904c698361f5f9" +SRCREV_qtdatavis3d = "3dce52ce02bb88120a94c32be692cefabc8b41f5" +SRCREV_qtdeclarative = "533a9a8afcc56635bed5da93102028e01fa708c0" +SRCREV_qtdeviceutilities = "4d2e84c4e0696112a96c8aa06735332f54f9e186" +SRCREV_qtgrpc = "830e48bd3b3e8e208402c1fc19fc6bd645527e19" +SRCREV_qthttpserver = "0348ecd76acd75510b13313c6eb986429beeb1aa" +SRCREV_qtimageformats = "27dd710b71f0415b78445ffa8c268e7a9452bc66" +SRCREV_qtinterfaceframework = "6503ff4e9899475d49ee2b7bbfd2d808f193a6a1" +SRCREV_qtlanguageserver = "f7f76cd719414a2d17eef54705238ae788238abd" +SRCREV_qtlocation = "bed7276aaed03bbf28bcfad3374c74ccbb0ce355" +SRCREV_qtlottie = "93e54a3da73c2d36aeb4e12de4de7a426403042e" +SRCREV_qtmqtt = "92468a8042838181362832ccf6b57f43732f7c52" +SRCREV_qtmultimedia = "1a927735bc49846bf9903e387418c6435807c66d" +SRCREV_qtnetworkauth = "2ca0cbce0c99b4c0f1c32478be5b9558909b8f89" +SRCREV_qtopcua = "99c1002fbb87200dc54ee02502b8217d21451e96" +SRCREV_qtpositioning = "a619623a4949071ddf7392d26b916890a751e965" +SRCREV_qtquick3d = "fd560ec34ed1ac81293b83f855925383fc77253c" SRCREV_qtquick3d-assimp = "fd7cd819e9e130385e17e707da31e60b82e787d0" -SRCREV_qtquick3dphysics = "a63d467705186277c1b8edaffc1282f93687e1fc" +SRCREV_qtquick3dphysics = "5ff8367b75fa0ecabf1cf7751e995f2f714749b8" SRCREV_qtquickdesigner-components = "5736952b4b0c8aab4ae56b622ea9a53ae718b60a" -SRCREV_qtquicktimeline = "cc97765c3ef20c11ebde35249a2083f9b2ebdf33" -SRCREV_qtremoteobjects = "4c7d60d8d1dd714e9878f8f7af0128dfea8b8d20" -SRCREV_qtscxml = "9a04f056e4b28b938359bbb06d703e89d80c49ae" -SRCREV_qtsensors = "97c14751f6853a36827b5e5c5d5747fe9be997fe" -SRCREV_qtserialbus = "6311f1c104dd1e9dcd63469f35acd8986864bc10" -SRCREV_qtserialport = "5e51689c6b90206197ad8ad4ad51d5f656baa0c4" -SRCREV_qtshadertools = "4ee1621c0a52320c9ce12bca3b29e6bd34d9bc64" -SRCREV_qtspeech = "e6edec352e3a89d3c1243b6a07da2dee52efba40" -SRCREV_qtsvg = "4a3177bfdb065a1b13793e8e522c73ca5c0bf927" -SRCREV_qttools = "f6ac15c88c8d7f2cbaf821d2a642db46c92435ea" +SRCREV_qtquicktimeline = "1bbd52db37b2252ff8f63024c46751ba338a338a" +SRCREV_qtremoteobjects = "553009b3123b5da9aec9487064387f11532a6fad" +SRCREV_qtscxml = "58833bc32956e6c17352a13b8cb888d3f607f186" +SRCREV_qtsensors = "545be9b8bb7c8fe0036ce5527b92f7c6d68d364c" +SRCREV_qtserialbus = "5876f32bc63a3cebed9843affac563d12822cf10" +SRCREV_qtserialport = "f476b3b95447c4c6168c3f510ebe34a27af6e232" +SRCREV_qtshadertools = "0733c88e07579a834694cd48513f973fb69b951a" +SRCREV_qtspeech = "1ff5a4aa426038b7c8f3711b0fe5cb0ac94b677c" +SRCREV_qtsvg = "11bf3030c05e77de9313fc71c383dd1a17ec40f7" +SRCREV_qttools = "8be3e6cff9903e7db610c185aad1b598cce0368c" SRCREV_qttools-qlitehtml = "f05f78ef33225823d348ee18f2fa464e95024dd2" SRCREV_qttools-qlitehtml-litehtml = "43af58e8adad70c4f1a0a9235546a246754c1737" -SRCREV_qttranslations = "abfe9aa2c0e8db8bf5d019938a3b1e43b9d739b6" -SRCREV_qtvirtualkeyboard = "d09d583483713f13bbbcd9a9b8f169f0954403bd" -SRCREV_qtwayland = "726d7c529d5e0ff4fb46e9137d13559642e50f52" -SRCREV_qtwebchannel = "4670dd47f3ad1e746965977246a268c8525fa9a9" -SRCREV_qtwebengine = "1874134e38537d4fb1d6c681c5e5778e65593556" +SRCREV_qttranslations = "252cad448b809c8d9e081865134272e458898b90" +SRCREV_qtvirtualkeyboard = "ae086beb7c9118a46c5da47927ac9f5989c1aeb9" +SRCREV_qtwayland = "a6527d381c8a6e3333b43ff5d9704dea0ab09a6d" +SRCREV_qtwebchannel = "c772de714a2e8dec516c380a222ec58ad92459fc" +SRCREV_qtwebengine = "824be6fd525f415488c6117db8b03e1a90cabf05" SRCREV_qtwebengine-chromium = "21bb29b9b730cc215ee7dfb3cf343139a9be9522" -SRCREV_qtwebsockets = "88ef1a480fc6d91c1e71dd888326fbf0411cb31a" -SRCREV_qtwebview = "3de606af8fcda9ebe09e3d6d1605267f3523369e" +SRCREV_qtwebsockets = "d30ba737bff9c7815421c0f384a421aa7c82d23a" +SRCREV_qtwebview = "4481bfbc0d3a42ff24e86aa7a09667a5b15c5e1c"