diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2021-09-10 11:20:00 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2021-09-15 07:09:25 +0300 |
commit | 5e0f656cf00600d432e589b54f15200fa541f17f (patch) | |
tree | 31442d409f8bc0a0f6869f5485b83ccc39462266 | |
parent | 7f83b930828419c75ccff66e72776d695cc1f79d (diff) |
qt6: update submodulesv6.2.0-rc
- Update Qt modules to latest content in 6.2.0 branch
- Update deviceutilities to latest revision in 6.2.0 branch
- Update quickdesigner-components to latest revision in dev branch
Task-number: QTBUG-91012
Change-Id: I9a6e2fa39d0b6b6937ec265dc70b70ee9a509ded
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
38 files changed, 39 insertions, 182 deletions
diff --git a/recipes-qt/qt6/qt3d_git.bb b/recipes-qt/qt6/qt3d_git.bb index ad6a590..f7a20e0 100644 --- a/recipes-qt/qt6/qt3d_git.bb +++ b/recipes-qt/qt6/qt3d_git.bb @@ -27,5 +27,5 @@ PACKAGECONFIG[system-assimp] = "-DFEATURE_qt3d_system_assimp=ON,-DQT_FEATURE_qt3 PACKAGECONFIG[qtgamepad] = ",,qtgamepad" SRCREV_FORMAT = "qt3d_assimp" -SRCREV_qt3d = "477e5657a488a2a418d76e8b78d2f1584aeef212" +SRCREV_qt3d = "f0419c69a235efe44769379e7a724b58cd678188" SRCREV_assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" diff --git a/recipes-qt/qt6/qt5compat_git.bb b/recipes-qt/qt6/qt5compat_git.bb index ff38756..f00c763 100644 --- a/recipes-qt/qt6/qt5compat_git.bb +++ b/recipes-qt/qt6/qt5compat_git.bb @@ -21,4 +21,4 @@ PACKAGECONFIG[qml] = ",,qtdeclarative" BBCLASSEXTEND = "native nativesdk" -SRCREV = "60ea2a5b12d4ca7b51b14875672f1676d42c7008" +SRCREV = "d152376c253671a89a8ac4f3c197883916329f41" diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index e39b316..0ca9f80 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -2,7 +2,7 @@ DESCRIPTION ?= "Qt is a cross-platform application development framework for des HOMEPAGE ?= "https://www.qt.io" QT_MODULE ?= "${BPN}" -QT_MODULE_BRANCH ?= "6.2" +QT_MODULE_BRANCH ?= "6.2.0" QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE}.git;name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}" diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index d964279..0a38770 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -157,4 +157,4 @@ INHIBIT_PACKAGE_STRIP_FILES = "\ BBCLASSEXTEND = "native nativesdk" -SRCREV = "8ec406b2296abdbdc8606fa955a2f8feb5254b1f" +SRCREV = "a1f6721fc8874d0c15b723db9908d090cd422585" diff --git a/recipes-qt/qt6/qtcharts_git.bb b/recipes-qt/qt6/qtcharts_git.bb index 0b68ba7..b46c160 100644 --- a/recipes-qt/qt6/qtcharts_git.bb +++ b/recipes-qt/qt6/qtcharts_git.bb @@ -13,4 +13,4 @@ DEPENDS += "qtbase" PACKAGECONFIG ?= "qml" PACKAGECONFIG[qml] = ",,qtdeclarative" -SRCREV = "2e0552ef531aec24d758960a3accee1fa399402f" +SRCREV = "bd6abec028851a2273f63ec6726f6f0825bcf224" diff --git a/recipes-qt/qt6/qtcoap_git.bb b/recipes-qt/qt6/qtcoap_git.bb index db53e3e..25514a5 100644 --- a/recipes-qt/qt6/qtcoap_git.bb +++ b/recipes-qt/qt6/qtcoap_git.bb @@ -12,4 +12,4 @@ DEPENDS += "qtbase" PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative" -SRCREV = "95f16438ab9d290da564b0b36299fd21b21269d6" +SRCREV = "9d3e024e69e2fbbc7f76ea6449c28de5ad4f6bff" diff --git a/recipes-qt/qt6/qtconnectivity_git.bb b/recipes-qt/qt6/qtconnectivity_git.bb index 0830bc4..42071ac 100644 --- a/recipes-qt/qt6/qtconnectivity_git.bb +++ b/recipes-qt/qt6/qtconnectivity_git.bb @@ -20,4 +20,4 @@ DEPENDS += "qtbase qtdeclarative" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" PACKAGECONFIG[bluez] = "-DFEATURE_bluez=ON,-DFEATURE_bluez=OFF,bluez5" -SRCREV = "4dc5876bb8327e37ff13e945b8093bc69da07368" +SRCREV = "42ea98498aa25bc7b1911a7a6035aa21d856ccb6" diff --git a/recipes-qt/qt6/qtdatavis3d_git.bb b/recipes-qt/qt6/qtdatavis3d_git.bb index 7f5967d..80e1dcc 100644 --- a/recipes-qt/qt6/qtdatavis3d_git.bb +++ b/recipes-qt/qt6/qtdatavis3d_git.bb @@ -10,4 +10,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtdeclarative" -SRCREV = "96a12a2def0d7566995ab2350365a7fb045b4914" +SRCREV = "6023c0ff5df62c553196a69c79af84a1396f4af7" diff --git a/recipes-qt/qt6/qtdeclarative_git.bb b/recipes-qt/qt6/qtdeclarative_git.bb index c0d3581..0c72c29 100644 --- a/recipes-qt/qt6/qtdeclarative_git.bb +++ b/recipes-qt/qt6/qtdeclarative_git.bb @@ -16,4 +16,4 @@ DEPENDS += "qtbase qtshadertools qtshadertools-native qtdeclarative-native" BBCLASSEXTEND = "native nativesdk" -SRCREV = "edb3d1ff7909945113274f3ed2a3bbe1b8f1273c" +SRCREV = "830eaefec50e0ba36bbdce412bd79a4919267fa2" diff --git a/recipes-qt/qt6/qtdeviceutilities_git.bb b/recipes-qt/qt6/qtdeviceutilities_git.bb index 66052e8..c4223d8 100644 --- a/recipes-qt/qt6/qtdeviceutilities_git.bb +++ b/recipes-qt/qt6/qtdeviceutilities_git.bb @@ -8,4 +8,4 @@ include recipes-qt/qt6/qt6-git.inc DEPENDS = "qtbase qtdeclarative qtdeclarative-native qtvirtualkeyboard" RDEPENDS_${PN} = "connman" -SRCREV = "a09f06018afc12f8f5af728d306ec596b810dc48" +SRCREV = "a83082dc52c83895de6221688c55fb49c094d84e" diff --git a/recipes-qt/qt6/qtimageformats_git.bb b/recipes-qt/qt6/qtimageformats_git.bb index 5b15b62..9c84068 100644 --- a/recipes-qt/qt6/qtimageformats_git.bb +++ b/recipes-qt/qt6/qtimageformats_git.bb @@ -24,4 +24,4 @@ PACKAGECONFIG[mng] = "-DFEATURE_mng=ON,-DFEATURE_mng=OFF,libmng" PACKAGECONFIG[tiff] = "-DFEATURE_tiff=ON,-DFEATURE_libtiff=OFF,tiff" PACKAGECONFIG[webp] = "-DFEATURE_webp=ON,-DFEATURE_webp=OFF,libwebp" -SRCREV = "689b8c55e2bb310d1ad1c2fac6085bc8ba7cd22a" +SRCREV = "881ca22d208a5a9171c4373ec22a69a6beecd704" diff --git a/recipes-qt/qt6/qtlottie_git.bb b/recipes-qt/qt6/qtlottie_git.bb index 1663657..66eb9c0 100644 --- a/recipes-qt/qt6/qtlottie_git.bb +++ b/recipes-qt/qt6/qtlottie_git.bb @@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtdeclarative" -SRCREV = "b7ad7f07aba3d9d33b31afeef05bc3beb315682c" +SRCREV = "464c1bf7b7c719c3387b611feea02ee7fedeab52" diff --git a/recipes-qt/qt6/qtmqtt_git.bb b/recipes-qt/qt6/qtmqtt_git.bb index e7d861b..a7de183 100644 --- a/recipes-qt/qt6/qtmqtt_git.bb +++ b/recipes-qt/qt6/qtmqtt_git.bb @@ -13,4 +13,4 @@ DEPENDS += "qtbase" PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets" -SRCREV = "96c60c91bbdeb9889513fbb958cd945646632554" +SRCREV = "2d26dfbc699f9b2862954ad6ecd0f3aeee76dda4" diff --git a/recipes-qt/qt6/qtmultimedia/0001-Fix-build-issue-with-conflicting-declarations-in-GL-.patch b/recipes-qt/qt6/qtmultimedia/0001-Fix-build-issue-with-conflicting-declarations-in-GL-.patch deleted file mode 100644 index 8efe46e..0000000 --- a/recipes-qt/qt6/qtmultimedia/0001-Fix-build-issue-with-conflicting-declarations-in-GL-.patch +++ /dev/null @@ -1,43 +0,0 @@ -From af25cd7a2f4b14bf3efb8c5ffe8c7f0a3785426a Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Tue, 7 Sep 2021 14:25:44 +0300 -Subject: [PATCH] Fix build issue with conflicting declarations in GL headers - -Some graphics stacks have old version of GL/GLES headers which have conflicting -declaration and fail when GL and GLES headers are used at the same time. - -/usr/include/GL/glext.h:466:19: error: conflicting declaration 'typedef ptrdiff_t GLsizeiptr' - | typedef ptrdiff_t GLsizeiptr; - | ^~~~~~~~ - -/usr/include/GLES3/gl3.h:75:25: note: previous declaration as 'typedef khronos_ssize_t GLsizeiptr' - | typedef khronos_ssize_t GLsizeiptr; - | ^~~~~~~~~~ - -Pick-to: 6.2 -Change-Id: I98b96755ea1b27c942214adf3d76e65539302053 ---- - src/multimedia/platform/gstreamer/common/qgstvideobuffer.cpp | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/multimedia/platform/gstreamer/common/qgstvideobuffer.cpp b/src/multimedia/platform/gstreamer/common/qgstvideobuffer.cpp -index 6511855c1..7cd022a82 100644 ---- a/src/multimedia/platform/gstreamer/common/qgstvideobuffer.cpp -+++ b/src/multimedia/platform/gstreamer/common/qgstvideobuffer.cpp -@@ -54,6 +54,7 @@ - #include <QtGui/private/qrhigles2_p.h> - #include <QtGui/qopenglcontext.h> - #include <QtGui/qopenglfunctions.h> -+#include <QtGui/qopengl.h> - - #include <gst/gl/gstglconfig.h> - #include <gst/gl/gstglmemory.h> -@@ -62,8 +63,6 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> --#define GL_GLEXT_PROTOTYPES --#include <GL/gl.h> - #endif - - QT_BEGIN_NAMESPACE diff --git a/recipes-qt/qt6/qtmultimedia/0001-Only-use-available-gstreamer-video-formats.patch b/recipes-qt/qt6/qtmultimedia/0001-Only-use-available-gstreamer-video-formats.patch deleted file mode 100644 index 0f77735..0000000 --- a/recipes-qt/qt6/qtmultimedia/0001-Only-use-available-gstreamer-video-formats.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c1745b55d0ea99f2730b13769c1a2d69c5426077 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo <samuli.piippo@qt.io> -Date: Wed, 8 Sep 2021 07:47:42 +0300 -Subject: [PATCH] Only use available gstreamer video formats - -Check the gstreamer version before using video format that were added -after GStreamer 1.14 release. - - * @GST_VIDEO_FORMAT_VUYA: packed 4:4:4 YUV with alpha channel (V0-U0-Y0-A0...) (Since: 1.16) - * @GST_VIDEO_FORMAT_BGR10A2_LE: packed 4:4:4 RGB with alpha channel(B-G-R-A), 10 bits for R/G/B channel and MSB 2 bits for alpha channel (Since: 1.16) - -Pick-to: 6.2 -Change-Id: Ib2cc5265f43e4fcb059e897ef96969154f27c297 ---- - src/multimedia/platform/gstreamer/common/qgstvideobuffer.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/src/multimedia/platform/gstreamer/common/qgstvideobuffer.cpp b/src/multimedia/platform/gstreamer/common/qgstvideobuffer.cpp -index 7cd022a82..b93cb9eac 100644 ---- a/src/multimedia/platform/gstreamer/common/qgstvideobuffer.cpp -+++ b/src/multimedia/platform/gstreamer/common/qgstvideobuffer.cpp -@@ -46,6 +46,7 @@ - #include <gst/video/video.h> - #include <gst/video/video-frame.h> - #include <gst/video/gstvideometa.h> -+#include <gst/pbutils/gstpluginsbaseversion.h> - - #include "qgstutils_p.h" - -@@ -208,7 +209,9 @@ fourccFromVideoInfo(const GstVideoInfo * info, int plane) - case GST_VIDEO_FORMAT_ABGR: - case GST_VIDEO_FORMAT_xBGR: - case GST_VIDEO_FORMAT_AYUV: -+#if GST_CHECK_PLUGINS_BASE_VERSION(1,16,0) - case GST_VIDEO_FORMAT_VUYA: -+#endif - return rgba_fourcc; - - case GST_VIDEO_FORMAT_GRAY8: -@@ -231,8 +234,10 @@ fourccFromVideoInfo(const GstVideoInfo * info, int plane) - case GST_VIDEO_FORMAT_Y444: - return DRM_FORMAT_R8; - -+#if GST_CHECK_PLUGINS_BASE_VERSION(1,16,0) - case GST_VIDEO_FORMAT_BGR10A2_LE: - return DRM_FORMAT_BGRA1010102; -+#endif - - // case GST_VIDEO_FORMAT_RGB10A2_LE: - // return DRM_FORMAT_RGBA1010102; diff --git a/recipes-qt/qt6/qtmultimedia_git.bb b/recipes-qt/qt6/qtmultimedia_git.bb index 00562d9..bd18696 100644 --- a/recipes-qt/qt6/qtmultimedia_git.bb +++ b/recipes-qt/qt6/qtmultimedia_git.bb @@ -14,11 +14,6 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtshadertools qtshadertools-native" -SRC_URI += "\ - file://0001-Fix-build-issue-with-conflicting-declarations-in-GL-.patch \ - file://0001-Only-use-available-gstreamer-video-formats.patch \ -" - PACKAGECONFIG ?= "gstreamer qml" PACKAGECONFIG[alsa] = "-DFEATURE_alsa=ON,-DFEATURE_alsa=OFF,alsa-lib" PACKAGECONFIG[pulseaudio] = "-DFEATURE_pulseaudio=ON,-DFEATURE_pulseaudio=OFF,pulseaudio" @@ -27,4 +22,4 @@ PACKAGECONFIG[qml] = ",,qtdeclarative" EXTRA_OECMAKE += "-DFEATURE_gpu_vivante=OFF" -SRCREV = "c5e10ab0413b35aff30567b7df360bb995e66bc7" +SRCREV = "e3543802e6ac47906de5b2dbba01ae32bb669b18" diff --git a/recipes-qt/qt6/qtnetworkauth_git.bb b/recipes-qt/qt6/qtnetworkauth_git.bb index 4442f24..2fd9a55 100644 --- a/recipes-qt/qt6/qtnetworkauth_git.bb +++ b/recipes-qt/qt6/qtnetworkauth_git.bb @@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase" -SRCREV = "f0ccf178e680079225e2a49becd493fe7cc34f77" +SRCREV = "eef5b6383d8dff8aa31c666b048c31a28fd5d56b" diff --git a/recipes-qt/qt6/qtopcua_git.bb b/recipes-qt/qt6/qtopcua_git.bb index 7e1faef..bd378da 100644 --- a/recipes-qt/qt6/qtopcua_git.bb +++ b/recipes-qt/qt6/qtopcua_git.bb @@ -20,4 +20,4 @@ SECURITY_STRINGFORMAT = "" DEPENDS += "qtbase" -SRCREV = "3ccc1d4aa4373e37554cd101ae09edb177f2ffe2" +SRCREV = "5e23095734dbb25ed18059704245473780a8125b" diff --git a/recipes-qt/qt6/qtpositioning_git.bb b/recipes-qt/qt6/qtpositioning_git.bb index c651319..d9fc215 100644 --- a/recipes-qt/qt6/qtpositioning_git.bb +++ b/recipes-qt/qt6/qtpositioning_git.bb @@ -22,4 +22,4 @@ PACKAGECONFIG[gypsy] = "-DFEATURE_gypsy=ON,-DFEATURE_gypsy=OFF,gconf gypsy" PACKAGECONFIG[nmea] = ",,qtserialport" PACKAGECONFIG[qml] = ",,qtdeclarative" -SRCREV = "1ec8c1ec20781a428da3f03c169dffc2f6392dd5" +SRCREV = "7373157d821b71b4b33bfe420a4e216675a535b6" diff --git a/recipes-qt/qt6/qtquick3d_git.bb b/recipes-qt/qt6/qtquick3d_git.bb index e7a07d4..8665d3b 100644 --- a/recipes-qt/qt6/qtquick3d_git.bb +++ b/recipes-qt/qt6/qtquick3d_git.bb @@ -26,5 +26,5 @@ FILES_${PN}-qmlplugins += " \ " SRCREV_FORMAT = "qtquick3d_assimp" -SRCREV_qtquick3d = "bee7498a9d14e5c296d6767eb46a04b5f2563ee6" +SRCREV_qtquick3d = "c84eed2b20f8ca959e485c3214ee22a515a54ece" SRCREV_assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" diff --git a/recipes-qt/qt6/qtquickdesigner-components_git.bb b/recipes-qt/qt6/qtquickdesigner-components_git.bb index 279ffa5..faafbb2 100644 --- a/recipes-qt/qt6/qtquickdesigner-components_git.bb +++ b/recipes-qt/qt6/qtquickdesigner-components_git.bb @@ -13,4 +13,4 @@ QT_MODULE_BRANCH = "dev" DEPENDS += "qtbase qtdeclarative" -SRCREV = "13617652eec2e7cae989c1707fd591e7685d7241" +SRCREV = "decdf79401763670419c45cd33e38390d46d8db4" diff --git a/recipes-qt/qt6/qtquicktimeline_git.bb b/recipes-qt/qt6/qtquicktimeline_git.bb index ce66594..c05f241 100644 --- a/recipes-qt/qt6/qtquicktimeline_git.bb +++ b/recipes-qt/qt6/qtquicktimeline_git.bb @@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS = "qtbase qtdeclarative" -SRCREV = "89e34a34a310dc4e8d69867c8c6c74c4c98257b6" +SRCREV = "c2a29b33475ae602a057b8ac6255a6c872618ac4" diff --git a/recipes-qt/qt6/qtremoteobjects_git.bb b/recipes-qt/qt6/qtremoteobjects_git.bb index 0d210ff..396869d 100644 --- a/recipes-qt/qt6/qtremoteobjects_git.bb +++ b/recipes-qt/qt6/qtremoteobjects_git.bb @@ -13,6 +13,6 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" -SRCREV = "f579ca75f9ea15ab088fc6f75d946704d66b14df" +SRCREV = "c956f6368631938c802db7ed1e8176ba9be8ed41" BBCLASSEXTEND += "native nativesdk" diff --git a/recipes-qt/qt6/qtscxml_git.bb b/recipes-qt/qt6/qtscxml_git.bb index b3fabde..99b1a11 100644 --- a/recipes-qt/qt6/qtscxml_git.bb +++ b/recipes-qt/qt6/qtscxml_git.bb @@ -17,4 +17,4 @@ PACKAGECONFIG[qml] = ",,qtdeclarative qtdeclarative-native" BBCLASSEXTEND = "native nativesdk" -SRCREV = "899f157aa976639c7e12dabbd68c63a50cf60279" +SRCREV = "6f0c45fb7648d1116638c84c8562e8ec12f8795f" diff --git a/recipes-qt/qt6/qtsensors_git.bb b/recipes-qt/qt6/qtsensors_git.bb index e144a3f..3223d76 100644 --- a/recipes-qt/qt6/qtsensors_git.bb +++ b/recipes-qt/qt6/qtsensors_git.bb @@ -14,4 +14,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtdeclarative" -SRCREV = "fca30daec7ca89855cb1374d7480e0d36c041cc8" +SRCREV = "45ae518006f1624097bfd029a8cd2f8780610ae2" diff --git a/recipes-qt/qt6/qtserialbus_git.bb b/recipes-qt/qt6/qtserialbus_git.bb index 532e746..b027935 100644 --- a/recipes-qt/qt6/qtserialbus_git.bb +++ b/recipes-qt/qt6/qtserialbus_git.bb @@ -15,4 +15,4 @@ DEPENDS += "qtbase qtserialport qtserialbus-native" BBCLASSEXTEND = "native nativesdk" -SRCREV = "aabc0728050e3370a28f11f99c10a2546755e8fb" +SRCREV = "ae2372e340f4ecb07d73630e875f10397a0a7d38" diff --git a/recipes-qt/qt6/qtserialport_git.bb b/recipes-qt/qt6/qtserialport_git.bb index af7b402..63045e9 100644 --- a/recipes-qt/qt6/qtserialport_git.bb +++ b/recipes-qt/qt6/qtserialport_git.bb @@ -16,4 +16,4 @@ DEPENDS += "qtbase" BBCLASSEXTEND = "native nativesdk" -SRCREV = "d2fc5875012b72fde30186210bbcd2f36847ba13" +SRCREV = "7a7e7376e3cc7cbd39e7eb7b5b6398d2553dd9a2" diff --git a/recipes-qt/qt6/qtshadertools_git.bb b/recipes-qt/qt6/qtshadertools_git.bb index df10374..fc07f04 100644 --- a/recipes-qt/qt6/qtshadertools_git.bb +++ b/recipes-qt/qt6/qtshadertools_git.bb @@ -12,4 +12,4 @@ DEPENDS = "qtbase qtshadertools-native" BBCLASSEXTEND = "native nativesdk" -SRCREV = "15c52bf98a2bc114576b5e74bd9da05ccf6ce261" +SRCREV = "e7f5087e43fc3f9a6a6202321d59c96fb8a8d0f9" diff --git a/recipes-qt/qt6/qtsvg_git.bb b/recipes-qt/qt6/qtsvg_git.bb index ddd2ad8..f6f63d7 100644 --- a/recipes-qt/qt6/qtsvg_git.bb +++ b/recipes-qt/qt6/qtsvg_git.bb @@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase" -SRCREV = "f6e7779299d275c86a150147d23bd8353bd7cbed" +SRCREV = "f41ee4fab89394361de39002ebb1252a2dde21be" diff --git a/recipes-qt/qt6/qttools_git.bb b/recipes-qt/qt6/qttools_git.bb index c7f1115..d04c43b 100644 --- a/recipes-qt/qt6/qttools_git.bb +++ b/recipes-qt/qt6/qttools_git.bb @@ -25,6 +25,6 @@ BBCLASSEXTEND = "native nativesdk" SRCREV_FORMAT = "qttools_qlitehtml_litehtml" -SRCREV_qttools = "2c435eca7f5d358713eca154790ecea7e26f3b13" +SRCREV_qttools = "8b3c7447d691d708e7f6ae19158041531be5cab7" SRCREV_qlitehtml = "908670c5b68d3bcf4712019a028079b8b2042dd4" SRCREV_litehtml = "db7f59d5886fd50f84d48720c79dc2e6152efa83" diff --git a/recipes-qt/qt6/qttranslations_git.bb b/recipes-qt/qt6/qttranslations_git.bb index 9e27096..0351186 100644 --- a/recipes-qt/qt6/qttranslations_git.bb +++ b/recipes-qt/qt6/qttranslations_git.bb @@ -25,4 +25,4 @@ python split_translation_packages () { d.setVar('RRECOMMENDS_' + pn, ' '.join(pkgs)) } -SRCREV = "fbf74fb1584cca6a97680ff94164dc77b70c3ec9" +SRCREV = "02783d8aa91a155a744a94e4b14d9ef0e1b58514" diff --git a/recipes-qt/qt6/qtvirtualkeyboard_git.bb b/recipes-qt/qt6/qtvirtualkeyboard_git.bb index 868fe07..bbe5bce 100644 --- a/recipes-qt/qt6/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt6/qtvirtualkeyboard_git.bb @@ -115,4 +115,4 @@ FILES_${PN}-dictionaries = "${QT6_INSTALL_DATADIR}/qtvirtualkeyboard/*/*.dat" DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native" -SRCREV = "aa9d774ff931d911bf2fc37ec0a546eb30e9b767" +SRCREV = "10cfad9a04817967d58fb4395be32f22afcc6452" diff --git a/recipes-qt/qt6/qtwayland_git.bb b/recipes-qt/qt6/qtwayland_git.bb index ba3b5d0..18f3d69 100644 --- a/recipes-qt/qt6/qtwayland_git.bb +++ b/recipes-qt/qt6/qtwayland_git.bb @@ -37,4 +37,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native" BBCLASSEXTEND = "native nativesdk" -SRCREV = "cb636d13ada7fd2f72ee4754412f52540958a098" +SRCREV = "ca3a1cbd12bc90c6fd3aaabec84bf5d90ba4e343" diff --git a/recipes-qt/qt6/qtwebchannel_git.bb b/recipes-qt/qt6/qtwebchannel_git.bb index 1562ed1..9548715 100644 --- a/recipes-qt/qt6/qtwebchannel_git.bb +++ b/recipes-qt/qt6/qtwebchannel_git.bb @@ -18,4 +18,4 @@ PACKAGECONFIG ?= "qml" PACKAGECONFIG[examples] = "-DQT_BUILD_EXAMPLES=ON,-DQT_BUILD_EXAMPLES=OFF,qtdeclarative qtwebsockets" PACKAGECONFIG[qml] = ",,qtdeclarative" -SRCREV = "c3134b642cb404f8cb492c5aa437bb623bdf2d3a" +SRCREV = "a85e2f154cd662397303d4d40ee28e342826318d" diff --git a/recipes-qt/qt6/qtwebengine.inc b/recipes-qt/qt6/qtwebengine.inc index 0895173..259998e 100644 --- a/recipes-qt/qt6/qtwebengine.inc +++ b/recipes-qt/qt6/qtwebengine.inc @@ -41,9 +41,8 @@ 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-BUILD-do-not-specify-march-on-arm.patch;patchdir=src/3rdparty \ " -SRCREV_qtwebengine = "7ba87489eed4acce903bc10ec14162c426641bd9" -SRCREV_chromium = "f41bb66fa5f499b4e5eae8ea08661aaa75f2d5df" +SRCREV_qtwebengine = "9d319982178a13d7c4195a6bc383b2f58c9f8468" +SRCREV_chromium = "202e34476e934633b3c2e4679a53c4b0847364a8" SRCREV = "${SRCREV_qtwebengine}" diff --git a/recipes-qt/qt6/qtwebengine/0002-Enable-examples.patch b/recipes-qt/qt6/qtwebengine/0002-Enable-examples.patch index 926a702..75b9dc6 100644 --- a/recipes-qt/qt6/qtwebengine/0002-Enable-examples.patch +++ b/recipes-qt/qt6/qtwebengine/0002-Enable-examples.patch @@ -1,4 +1,4 @@ -From 74b7a7a52c921cd911c114c7be25703b107dba7f Mon Sep 17 00:00:00 2001 +From 8e132b25c19836f66dd844ed53da3122f1a56cd5 Mon Sep 17 00:00:00 2001 From: Samuli Piippo <samuli.piippo@qt.io> Date: Tue, 31 Aug 2021 18:27:48 +0300 Subject: [PATCH] Enable examples @@ -8,10 +8,10 @@ The bug mentioned does not affect bitbake builds. Change-Id: I076763d9241061f9cdb4d46bcd88e46bd4f783aa --- examples/CMakeLists.txt | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt -index 54e8d5006..e236a7059 100644 +index e1762672..a336c313 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,7 +1,7 @@ @@ -20,6 +20,6 @@ index 54e8d5006..e236a7059 100644 qt_examples_build_begin() -if(NOT CMAKE_CROSSCOMPILING) #QTBUG-86533 +if(TRUE) #QTBUG-86533 - if(QT_FEATURE_qtwebengine_build AND QT_FEATURE_qtwebengine_quick_build) + if(TARGET Qt::WebEngineCore) add_subdirectory(webengine) endif() diff --git a/recipes-qt/qt6/qtwebengine/chromium/0003-BUILD-do-not-specify-march-on-arm.patch b/recipes-qt/qt6/qtwebengine/chromium/0003-BUILD-do-not-specify-march-on-arm.patch deleted file mode 100644 index 831421f..0000000 --- a/recipes-qt/qt6/qtwebengine/chromium/0003-BUILD-do-not-specify-march-on-arm.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ffd11602479dd9dc0f4aa2ea03757199abbfa8a2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 22 Jan 2019 00:17:41 -0800 -Subject: [PATCH] BUILD: do not specify march on arm - -Do not try to set the guessed values for march/mtune/float-abi -OE config machinary has computed these values already and fed it -via compiler cmdline to chromium build - -I think upstream should check for the values on compiler cmdline -before overriding these - -Upstream-Status: Inappropriate [OE-Specific] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - chromium/build/config/compiler/BUILD.gn | 14 -------------- - 1 file changed, 14 deletions(-) - -diff --git a/chromium/build/config/compiler/BUILD.gn b/chromium/build/config/compiler/BUILD.gn -index 503670c1aae..b9be233099e 100644 ---- a/chromium/build/config/compiler/BUILD.gn -+++ b/chromium/build/config/compiler/BUILD.gn -@@ -853,20 +853,6 @@ config("compiler_cpu_abi") { - "-msse3", - ] - } -- } else if (current_cpu == "arm") { -- if (is_clang && !is_android && !is_nacl) { -- cflags += [ "--target=arm-linux-gnueabihf" ] -- ldflags += [ "--target=arm-linux-gnueabihf" ] -- } -- if (!is_nacl) { -- cflags += [ -- "-march=$arm_arch", -- "-mfloat-abi=$arm_float_abi", -- ] -- } -- if (arm_tune != "") { -- cflags += [ "-mtune=$arm_tune" ] -- } - } else if (current_cpu == "arm64") { - if (is_clang && !is_android && !is_nacl && !is_fuchsia) { - cflags += [ "--target=aarch64-linux-gnu" ] diff --git a/recipes-qt/qt6/qtwebsockets_git.bb b/recipes-qt/qt6/qtwebsockets_git.bb index 9ac1b23..5f21406 100644 --- a/recipes-qt/qt6/qtwebsockets_git.bb +++ b/recipes-qt/qt6/qtwebsockets_git.bb @@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtdeclarative" -SRCREV = "ae1660cea1400b39e460a3e002e6d11e7cc025e5" +SRCREV = "25487db640c28754827373190546f947f2e1eb67" |