From f7ba29657711ac24ff9fed227a0c3158b626e997 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 9 Feb 2021 10:54:14 +0200 Subject: [PATCH] qt6: update submodules Update to the latest revisions from dev branches. Change-Id: Ia1ff260fd02e2c1a6dbb275c9e4679db6987935c Reviewed-by: Mikko Gronoff --- recipes-qt/qt6/qt3d_git.bb | 4 ++-- recipes-qt/qt6/qt5compat_git.bb | 2 +- recipes-qt/qt6/qt6-git.inc | 2 +- ...nfo-allow-to-set-qt.conf-from-the-outside-u.patch | 12 ++++++------ recipes-qt/qt6/qtbase_git.bb | 2 +- recipes-qt/qt6/qtcharts_git.bb | 2 +- recipes-qt/qt6/qtcoap_git.bb | 2 +- recipes-qt/qt6/qtdeclarative_git.bb | 2 +- recipes-qt/qt6/qtimageformats_git.bb | 2 +- recipes-qt/qt6/qtmqtt_git.bb | 2 +- recipes-qt/qt6/qtnetworkauth_git.bb | 2 +- recipes-qt/qt6/qtopcua_git.bb | 2 +- recipes-qt/qt6/qtquick3d_git.bb | 4 ++-- recipes-qt/qt6/qtquickcontrols2_git.bb | 2 +- recipes-qt/qt6/qtquicktimeline_git.bb | 2 +- recipes-qt/qt6/qtserialbus_git.bb | 4 ++-- recipes-qt/qt6/qtserialport_git.bb | 4 ++-- recipes-qt/qt6/qtshadertools_git.bb | 2 +- recipes-qt/qt6/qtsvg_git.bb | 2 +- recipes-qt/qt6/qttools_git.bb | 2 +- recipes-qt/qt6/qttranslations_git.bb | 2 +- recipes-qt/qt6/qtvirtualkeyboard_git.bb | 2 +- recipes-qt/qt6/qtwayland_git.bb | 2 +- recipes-qt/qt6/qtwebsockets_git.bb | 2 +- 24 files changed, 33 insertions(+), 33 deletions(-) diff --git a/recipes-qt/qt6/qt3d_git.bb b/recipes-qt/qt6/qt3d_git.bb index d9619fc..87d6577 100644 --- a/recipes-qt/qt6/qt3d_git.bb +++ b/recipes-qt/qt6/qt3d_git.bb @@ -25,5 +25,5 @@ PACKAGECONFIG[system-assimp] = "-DFEATURE_system_assimp=ON,-DQT_FEATURE_system_a PACKAGECONFIG[qtgamepad] = ",,qtgamepad" SRCREV_FORMAT = "qt3d_assimp" -SRCREV_qt3d = "cf7127a7897b072af16a78139afc6059e9e7c9a5" -SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df" +SRCREV_qt3d = "b2d0ef3f7ab36b93a51eb0bea14afe1e9fc5c0d1" +SRCREV_assimp = "4e5017df696cf92301e75b200927c8c0dbeeb56d" diff --git a/recipes-qt/qt6/qt5compat_git.bb b/recipes-qt/qt6/qt5compat_git.bb index 1c6a6eb..af25cf4 100644 --- a/recipes-qt/qt6/qt5compat_git.bb +++ b/recipes-qt/qt6/qt5compat_git.bb @@ -17,4 +17,4 @@ DEPENDS += "qtbase" PACKAGECONFIG[iconv] = "-DFEATURE_iconv=ON,-DFEATURE_iconv=OFF,virtual/libiconv" -SRCREV = "e8b4c8c245765827377cf634a081cabc544770c3" +SRCREV = "e11d5c33c90aa0007cbd40113d93d8d8344186d3" diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index e8ae7e7..b8e15b6 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -11,4 +11,4 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "6.1.0" +PV = "6.2.0" diff --git a/recipes-qt/qt6/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt6/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index da36a76..9e2cb07 100644 --- a/recipes-qt/qt6/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt6/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,8 +1,8 @@ -From fd50da53d4de86fe3a9e3eca24a7ae3e5c0f53fa Mon Sep 17 00:00:00 2001 +From dbbb5f6695c4fb8e01842ddb0b0690f60b62e061 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 2/3] qlibraryinfo: allow to set qt.conf from the outside using - the environment +Subject: [PATCH] qlibraryinfo: allow to set qt.conf from the outside using the + environment Allow to set a qt.conf from the outside using the environment. This allows to inject new prefixes and other paths into qmake. This is needed when using @@ -20,10 +20,10 @@ Signed-off-by: Martin Jansa 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index c8c7c0bf9b..90e81d0990 100644 +index a86436f4c8..c5856f6750 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -183,7 +183,10 @@ void QLibrarySettings::load() +@@ -181,7 +181,10 @@ void QLibrarySettings::load() QSettings *QLibraryInfoPrivate::findConfiguration() { #ifdef QT_BUILD_QMAKE @@ -32,6 +32,6 @@ index c8c7c0bf9b..90e81d0990 100644 + QString qtconfig = QFile::decodeName(config); + if(qtconfig.isEmpty() || !QFile::exists(qtconfig)) + qtconfig = qmake_libraryInfoFile(); - if (QFile::exists(qtconfig)) + if (!qtconfig.isEmpty()) return new QSettings(qtconfig, QSettings::IniFormat); #else diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index 5ac6088..c5f0140 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -149,4 +149,4 @@ FILES_${PN}-tools += "\ BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "c2657f9762e01abd65ac991ba31e3ca085d9540c" +SRCREV = "9bc849f9c4fe921763859d9c8f363563d6a59548" diff --git a/recipes-qt/qt6/qtcharts_git.bb b/recipes-qt/qt6/qtcharts_git.bb index d26cc86..ced997b 100644 --- a/recipes-qt/qt6/qtcharts_git.bb +++ b/recipes-qt/qt6/qtcharts_git.bb @@ -10,4 +10,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS += "qtbase qtdeclarative" -SRCREV = "6e9df608606fc67480e2e7c0aa473b13389db2a4" +SRCREV = "ae5d6999c8fbff2a711899da24e486ff19596e69" diff --git a/recipes-qt/qt6/qtcoap_git.bb b/recipes-qt/qt6/qtcoap_git.bb index 6425e87..29678f1 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 = "7c1d0c871e89f2faad14fc5883b024dd532d3e9c" +SRCREV = "3b9fdf30ba6613220d851ca553d7b4a8183b1438" diff --git a/recipes-qt/qt6/qtdeclarative_git.bb b/recipes-qt/qt6/qtdeclarative_git.bb index 9790124..b38309c 100644 --- a/recipes-qt/qt6/qtdeclarative_git.bb +++ b/recipes-qt/qt6/qtdeclarative_git.bb @@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative-native" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "c2c180e4ee58f8cfc104207b3b56e83ddcb7e79a" +SRCREV = "9a9c13a4a36707db704412812780015b8d839766" diff --git a/recipes-qt/qt6/qtimageformats_git.bb b/recipes-qt/qt6/qtimageformats_git.bb index ce7b07f..7521363 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 = "6dc07aa351c5da856f992862f7260096e7ce35bb" +SRCREV = "d0adfb770bd02da36a626ed10c5c00f0f5ef0862" diff --git a/recipes-qt/qt6/qtmqtt_git.bb b/recipes-qt/qt6/qtmqtt_git.bb index 015ef06..841e96a 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 = "cfd837ee491f82cffb5c137a35dec958dd25fd15" +SRCREV = "7f387ede31cb3b770014938be49f472692570c04" diff --git a/recipes-qt/qt6/qtnetworkauth_git.bb b/recipes-qt/qt6/qtnetworkauth_git.bb index 009cd39..a5f82c9 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 = "efdcb01ad03bc43de2eb8f6611d9b6b777108441" +SRCREV = "8c48f1513e7bb9b00a2361088a116d2dd31937d7" diff --git a/recipes-qt/qt6/qtopcua_git.bb b/recipes-qt/qt6/qtopcua_git.bb index 265924a..6a2f33f 100644 --- a/recipes-qt/qt6/qtopcua_git.bb +++ b/recipes-qt/qt6/qtopcua_git.bb @@ -21,4 +21,4 @@ SECURITY_STRINGFORMAT = "" DEPENDS += "qtbase" -SRCREV = "e0df4cf65e25519a69d1a98b389abf7bda2380bb" +SRCREV = "4acff10f8582d8384a2875daa771b2777788995a" diff --git a/recipes-qt/qt6/qtquick3d_git.bb b/recipes-qt/qt6/qtquick3d_git.bb index eb4ce3b..e42e48c 100644 --- a/recipes-qt/qt6/qtquick3d_git.bb +++ b/recipes-qt/qt6/qtquick3d_git.bb @@ -25,5 +25,5 @@ FILES_${PN}-qmlplugins += " \ " SRCREV_FORMAT = "qtquick3d_assimp" -SRCREV_qtquick3d = "2e9f76543951ca2039f66573697aaf94a8023fd6" -SRCREV_assimp = "b3e1ee3ca0d825d384044867fc30cd0bc8417be6" +SRCREV_qtquick3d = "4a1d7bf5b6cf95a5cf669c95ab261f46d2e09e97" +SRCREV_assimp = "2cb0304e71166a5ebba61101ea13e6d97304c7e5" diff --git a/recipes-qt/qt6/qtquickcontrols2_git.bb b/recipes-qt/qt6/qtquickcontrols2_git.bb index 4b977b5..4dc91e6 100644 --- a/recipes-qt/qt6/qtquickcontrols2_git.bb +++ b/recipes-qt/qt6/qtquickcontrols2_git.bb @@ -12,4 +12,4 @@ include recipes-qt/qt6/qt6.inc DEPENDS = "qtbase qtdeclarative" -SRCREV = "83f49d3f4c0041bf2c74ff1ff2eb03c5d37aa1f4" +SRCREV = "20ae3f8f3e60eb93cc6b7070da85fc23edceb651" diff --git a/recipes-qt/qt6/qtquicktimeline_git.bb b/recipes-qt/qt6/qtquicktimeline_git.bb index f3fb141..b75d925 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 = "2a85480c4cec9e9beb0120c02da8c7faa1fae838" +SRCREV = "9ed0ead501600a7001aa0fa543cef719bf156017" diff --git a/recipes-qt/qt6/qtserialbus_git.bb b/recipes-qt/qt6/qtserialbus_git.bb index 6f630fb..82c457f 100644 --- a/recipes-qt/qt6/qtserialbus_git.bb +++ b/recipes-qt/qt6/qtserialbus_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.LGPLv3;md5=e0459b45c5c4840b353141a8bbed91f0 \ " -inherit qt6-qmake +inherit qt6-cmake include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc @@ -15,4 +15,4 @@ DEPENDS += "qtbase qtserialport qtserialbus-native" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "867b4d428f78fffe7fefeffaa2f819c9f345da26" +SRCREV = "227060f8c17aaf90fe542ad6079a6badaf410a0d" diff --git a/recipes-qt/qt6/qtserialport_git.bb b/recipes-qt/qt6/qtserialport_git.bb index b684582..2e13416 100644 --- a/recipes-qt/qt6/qtserialport_git.bb +++ b/recipes-qt/qt6/qtserialport_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " -inherit qt6-qmake +inherit qt6-cmake include recipes-qt/qt6/qt6-git.inc include recipes-qt/qt6/qt6.inc @@ -16,4 +16,4 @@ DEPENDS += "qtbase" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "5433343796549dc3393b341a2f65b398f8f4134d" +SRCREV = "1aaaa4997f0deb69af76793620443218ab0459f3" diff --git a/recipes-qt/qt6/qtshadertools_git.bb b/recipes-qt/qt6/qtshadertools_git.bb index db45f0d..fb630bc 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 = "984df1fa87adcef3e05730e3ec4c4bf56b4ea0d4" +SRCREV = "69868b5f95ab96d315036862b97e36563d9d9cb2" diff --git a/recipes-qt/qt6/qtsvg_git.bb b/recipes-qt/qt6/qtsvg_git.bb index f56e060..d362329 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 = "ff0bd2573e32730782d689870ed1cc9379a3e9fb" +SRCREV = "883fdf51a9f2319bf11f33eee65551ef11efeb00" diff --git a/recipes-qt/qt6/qttools_git.bb b/recipes-qt/qt6/qttools_git.bb index f641e43..489b7b6 100644 --- a/recipes-qt/qt6/qttools_git.bb +++ b/recipes-qt/qt6/qttools_git.bb @@ -18,4 +18,4 @@ FILES_${PN}-tools += "${QT6_INSTALL_DATADIR}/phrasebooks" BBCLASSEXTEND =+ "native nativesdk" -SRCREV = "2393e68dd5b2566a16cd8296fe0493c77eae22cb" +SRCREV = "b394478af7ed7a9269c65c2fbb11c702df19dbf8" diff --git a/recipes-qt/qt6/qttranslations_git.bb b/recipes-qt/qt6/qttranslations_git.bb index 5aa4e7b..427e22b 100644 --- a/recipes-qt/qt6/qttranslations_git.bb +++ b/recipes-qt/qt6/qttranslations_git.bb @@ -18,4 +18,4 @@ python populate_packages_prepend () { 'Qt translations for %s', extra_depends='') } -SRCREV = "ca19f7c57cc84f699976958770524063dfaf33e5" +SRCREV = "c0643cb8f11fe1dbe8abbff6a96e7f3e0c74f38a" diff --git a/recipes-qt/qt6/qtvirtualkeyboard_git.bb b/recipes-qt/qt6/qtvirtualkeyboard_git.bb index 84e0e15..875bfac 100644 --- a/recipes-qt/qt6/qtvirtualkeyboard_git.bb +++ b/recipes-qt/qt6/qtvirtualkeyboard_git.bb @@ -116,4 +116,4 @@ FILES_${PN}-dictionaries = "${QT6_INSTALL_DATADIR}/qtvirtualkeyboard/*/*.dat" DEPENDS += "qtbase qtdeclarative qtsvg qtdeclarative-native" -SRCREV = "90d64dea7d0370abcb5b787bcc77dc4770f491ed" +SRCREV = "8e14bac325f69f41a7f2bc8afeb745a080bbe09f" diff --git a/recipes-qt/qt6/qtwayland_git.bb b/recipes-qt/qt6/qtwayland_git.bb index 91580b2..714aa5e 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 = "e8e112e50bd27472a2cf3f65c10555f966a78454" +SRCREV = "96cb858590b453cce9c9afd370cd5a187558a8a0" diff --git a/recipes-qt/qt6/qtwebsockets_git.bb b/recipes-qt/qt6/qtwebsockets_git.bb index c63f258..3547e71 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 = "fa6c7e50321e7be048297e5d0ce8503647a9488e" +SRCREV = "69b87fc663f86b8cdeddd954a8a8449f783598b5"