From ed288f9132ebc19df7960f63af03b35036ae8c6a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 14 Apr 2021 16:53:02 +0300 Subject: [PATCH 1/3] Update submodules on '6.0' in qt/qt5 Change-Id: I8922ea95a484952c94fa88322e016e2965f4ef08 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt5compat b/qt5compat index abe88864..a1d45bea 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit abe888641b27d961931f59c1f79fcc704199d68e +Subproject commit a1d45beaf654cf6194adc9f7893f234d8b69be57 diff --git a/qtbase b/qtbase index 2711dc1f..49059a40 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2711dc1fe0f54fa23b9d2c166f08fda2fc2c995b +Subproject commit 49059a400707b2111c20db266d5e005941c70c8e diff --git a/qtdeclarative b/qtdeclarative index d62b56c4..b33cbd3b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d62b56c4217a2610d9c7db84ffd3cde010ffae7c +Subproject commit b33cbd3b7cd3eafef1d97f4b6deb0364e4a45af4 diff --git a/qtdoc b/qtdoc index f32ee5b4..7cdc235d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f32ee5b4e3e91bfcd56bc4bbc69f739ce37bdcdf +Subproject commit 7cdc235df1ce190018219f67f3738271133ee75e diff --git a/qtqa b/qtqa index 8745c1a4..9ddd06f8 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 8745c1a46671b94e4d34584b6056384ac0154b3d +Subproject commit 9ddd06f8c1ea002f27e16f33084f2e4ffdf3bd20 diff --git a/qtquick3d b/qtquick3d index 1ddbfdf7..8baf1cf8 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 1ddbfdf7fdf561d36e1cf3041e9f127e5c962234 +Subproject commit 8baf1cf8562c1574e30d832246affcdaf2bebe0c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 2dcb7eb5..79b6fdb7 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 2dcb7eb5a2a277848a655f18436b0e3c1c2c9d5d +Subproject commit 79b6fdb75c2d71caf3d7063a2a04b6362d57caa7 diff --git a/qtquicktimeline b/qtquicktimeline index b8efb145..9b115f62 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit b8efb145d088cf7867c3012e98006102deff9c48 +Subproject commit 9b115f62bd40983ccba7d1078025c916e1dad27e diff --git a/qtshadertools b/qtshadertools index 6ac10402..b3bafb48 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 6ac1040233d9a3eba51ab922c52bfab19a96bff2 +Subproject commit b3bafb48cc8e37d4805857e7d4c63685ce74fae6 diff --git a/qtsvg b/qtsvg index 08febc6a..09da9338 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 08febc6afbf35a817049e393e9dba0490314d40a +Subproject commit 09da9338ed667ec117de77acda3f64e3d7ee870a diff --git a/qttools b/qttools index e3305954..275305d7 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e33059549f822172681af902b4ec5f12f9ae5d27 +Subproject commit 275305d78344139fffdd3114fc144cd6f6887aff diff --git a/qttranslations b/qttranslations index 21d789ad..710757cd 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 21d789ad25ab32a7054f5ca9159b11f4fe03b60f +Subproject commit 710757cdf1a91e433c143f54c705dc52852acae9 diff --git a/qtwayland b/qtwayland index 9f35ae7d..d7d42c57 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 9f35ae7d161623be3cb61a2396d86f3000c5d4b4 +Subproject commit d7d42c5719412d37f80dc8b31fd40863620a502d From 2bf391ebd107ec993195ad6f8ae0c9f1700fc779 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 15 Apr 2021 07:56:39 +0300 Subject: [PATCH 2/3] Update submodules on '6.0' in qt/qt5 Change-Id: Ie62c52afa309c3daef66ea46699d08b5dc91ca4a Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt5compat b/qt5compat index a1d45bea..3dedca3f 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit a1d45beaf654cf6194adc9f7893f234d8b69be57 +Subproject commit 3dedca3f0895b08fb8356adf0075d6e5f241246b diff --git a/qtbase b/qtbase index 49059a40..fa2efb8b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 49059a400707b2111c20db266d5e005941c70c8e +Subproject commit fa2efb8b3577c69fee305c0d74f6996bbf84bd7a diff --git a/qtdeclarative b/qtdeclarative index b33cbd3b..830ee55e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b33cbd3b7cd3eafef1d97f4b6deb0364e4a45af4 +Subproject commit 830ee55e6568e668b1a887e218168a282417431a diff --git a/qtdoc b/qtdoc index 7cdc235d..1b454932 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7cdc235df1ce190018219f67f3738271133ee75e +Subproject commit 1b4549325cbb217ebfc7295fa216636ff83d3f8f diff --git a/qtqa b/qtqa index 9ddd06f8..41fbf925 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 9ddd06f8c1ea002f27e16f33084f2e4ffdf3bd20 +Subproject commit 41fbf9256ba6675ea2d74109493bd1a3c692eaa1 diff --git a/qtquick3d b/qtquick3d index 8baf1cf8..06421c5c 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 8baf1cf8562c1574e30d832246affcdaf2bebe0c +Subproject commit 06421c5c1618bac4c633202127adfce7c7ba0b1a diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 79b6fdb7..ab87e441 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 79b6fdb75c2d71caf3d7063a2a04b6362d57caa7 +Subproject commit ab87e4410d113a3c13d1859ce4bd382b687fe161 diff --git a/qtquicktimeline b/qtquicktimeline index 9b115f62..f37298ef 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 9b115f62bd40983ccba7d1078025c916e1dad27e +Subproject commit f37298efa219fbeb98836652f7f06a52facc2401 diff --git a/qtshadertools b/qtshadertools index b3bafb48..effd474e 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit b3bafb48cc8e37d4805857e7d4c63685ce74fae6 +Subproject commit effd474e86b294a64b366b3a547f6a66b3dfac11 diff --git a/qtsvg b/qtsvg index 09da9338..ed31e766 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 09da9338ed667ec117de77acda3f64e3d7ee870a +Subproject commit ed31e766662dfed60d0b40f37a1926b33bf7fa23 diff --git a/qttools b/qttools index 275305d7..aee7f2ec 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 275305d78344139fffdd3114fc144cd6f6887aff +Subproject commit aee7f2ec612c0d6285382e634be5e0b10da66c3d diff --git a/qttranslations b/qttranslations index 710757cd..4503a653 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 710757cdf1a91e433c143f54c705dc52852acae9 +Subproject commit 4503a6539aef626571389a1c205f378950b72181 diff --git a/qtwayland b/qtwayland index d7d42c57..0f6b246a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit d7d42c5719412d37f80dc8b31fd40863620a502d +Subproject commit 0f6b246a44b2d1e6c0c7bf01fb46584d512a574d From 20ddde5215951e1d4d5844f8ff127ff5cb381c75 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 12 Apr 2021 12:36:54 +0300 Subject: [PATCH 3/3] Provisioning: Add Vulkan installation for Ubuntu 20.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Vulkan is needed by examples Task-number: QTBUG-92545 Change-Id: I2f814e452c88c04919b26eb42e90bac18356bbe7 Reviewed-by: Ville-Pekka Karhu (cherry picked from commit 027f8ccb080c856c248af0e43f797c4461fd16f0) Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh index 058249ae..877863d4 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh @@ -189,6 +189,8 @@ installPackages+=(libhyphen-dev) installPackages+=(ssh) # For bitbake installPackages+=(diffstat) +# Vulkan is needed for examples +installPackages+=(libvulkan-dev) echo "Running update for apt" waitLoop