diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2021-04-16 11:15:28 +0000 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2021-04-16 11:15:28 +0000 |
commit | c00a3c1ec6447d1314420edc13cf67cdc147701e (patch) | |
tree | c92fc242d42346aea1dd27567c7425f11d5b3462 | |
parent | 62900e475d12cca670b66230b2bc9fb248169819 (diff) | |
parent | 20ddde5215951e1d4d5844f8ff127ff5cb381c75 (diff) |
Merge branch 6.0 into pyside6.0
Change-Id: Ic92fc242d42346aea1dd27567c7425f11d5b3462
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh | 2 | ||||
m--------- | qt5compat | 0 | ||||
m--------- | qtbase | 0 | ||||
m--------- | qtdeclarative | 0 | ||||
m--------- | qtdoc | 0 | ||||
m--------- | qtqa | 0 | ||||
m--------- | qtquick3d | 0 | ||||
m--------- | qtquickcontrols2 | 0 | ||||
m--------- | qtquicktimeline | 0 | ||||
m--------- | qtshadertools | 0 | ||||
m--------- | qtsvg | 0 | ||||
m--------- | qttools | 0 | ||||
m--------- | qttranslations | 0 | ||||
m--------- | qtwayland | 0 |
14 files changed, 2 insertions, 0 deletions
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 diff --git a/qt5compat b/qt5compat -Subproject abe888641b27d961931f59c1f79fcc704199d68 +Subproject 3dedca3f0895b08fb8356adf0075d6e5f241246 diff --git a/qtbase b/qtbase -Subproject 2711dc1fe0f54fa23b9d2c166f08fda2fc2c995 +Subproject fa2efb8b3577c69fee305c0d74f6996bbf84bd7 diff --git a/qtdeclarative b/qtdeclarative -Subproject d62b56c4217a2610d9c7db84ffd3cde010ffae7 +Subproject 830ee55e6568e668b1a887e218168a282417431 diff --git a/qtdoc b/qtdoc -Subproject f32ee5b4e3e91bfcd56bc4bbc69f739ce37bdcd +Subproject 1b4549325cbb217ebfc7295fa216636ff83d3f8 diff --git a/qtqa b/qtqa -Subproject 8745c1a46671b94e4d34584b6056384ac0154b3 +Subproject 41fbf9256ba6675ea2d74109493bd1a3c692eaa diff --git a/qtquick3d b/qtquick3d -Subproject 1ddbfdf7fdf561d36e1cf3041e9f127e5c96223 +Subproject 06421c5c1618bac4c633202127adfce7c7ba0b1 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 2dcb7eb5a2a277848a655f18436b0e3c1c2c9d5 +Subproject ab87e4410d113a3c13d1859ce4bd382b687fe16 diff --git a/qtquicktimeline b/qtquicktimeline -Subproject b8efb145d088cf7867c3012e98006102deff9c4 +Subproject f37298efa219fbeb98836652f7f06a52facc240 diff --git a/qtshadertools b/qtshadertools -Subproject 6ac1040233d9a3eba51ab922c52bfab19a96bff +Subproject effd474e86b294a64b366b3a547f6a66b3dfac1 diff --git a/qtsvg b/qtsvg -Subproject 08febc6afbf35a817049e393e9dba0490314d40 +Subproject ed31e766662dfed60d0b40f37a1926b33bf7fa2 diff --git a/qttools b/qttools -Subproject e33059549f822172681af902b4ec5f12f9ae5d2 +Subproject aee7f2ec612c0d6285382e634be5e0b10da66c3 diff --git a/qttranslations b/qttranslations -Subproject 21d789ad25ab32a7054f5ca9159b11f4fe03b60 +Subproject 4503a6539aef626571389a1c205f378950b7218 diff --git a/qtwayland b/qtwayland -Subproject 9f35ae7d161623be3cb61a2396d86f3000c5d4b +Subproject 0f6b246a44b2d1e6c0c7bf01fb46584d512a574 |