From 7585da561e142f37f7b62531bf27dc0197fe3610 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 6 Jul 2020 08:50:13 +0200 Subject: [PATCH 001/106] Update submodules on '5.15' in qt/qt5 Change-Id: I19249b4e49018d054a05a247abc44ecd3232821e Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtrepotools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qt3d b/qt3d index 5f83aa91136..85c21500c52 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 5f83aa911364925d93c552c4bbea885a4e2807ee +Subproject commit 85c21500c52fe4cbfa1aa9d556296f85abc062b9 diff --git a/qtbase b/qtbase index de6e92e26a4..81ce2d1d6fa 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit de6e92e26a49de4942f006c2e70f11d1dbf600d6 +Subproject commit 81ce2d1d6fa741de4d27b939a378147a02019ec1 diff --git a/qtdeclarative b/qtdeclarative index ad47d70e228..749ca5d0272 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ad47d70e2289d59625cd405fa54c5de2db68ad82 +Subproject commit 749ca5d0272eec49c2986eecebe897d311cbf372 diff --git a/qtdoc b/qtdoc index 64a0b3a31ab..0dcb328b033 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 64a0b3a31ab1080bd6183594588330a51cf4ad58 +Subproject commit 0dcb328b0332f2b438f00f365fb8d5707ea73339 diff --git a/qtmultimedia b/qtmultimedia index 8337692ea35..99db82a9936 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 8337692ea357da48e8914e6ab87d6cb6baf17dc7 +Subproject commit 99db82a99363a8819b7c1600c565d37b48409fbf diff --git a/qtqa b/qtqa index 36a71f6d34c..f32511d58ba 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 36a71f6d34c695e04c9d7b1eb829effcda0dce34 +Subproject commit f32511d58ba5593e4e92db0cfff323a616f591f1 diff --git a/qtquick3d b/qtquick3d index e133dec4278..45b3b76a952 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit e133dec4278ce34b68617e4ec7bbbdb841e60904 +Subproject commit 45b3b76a9529e31fc1b0d7423400d9a76cfef67d diff --git a/qtrepotools b/qtrepotools index 050705f615e..7d4c8b82348 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 050705f615e5c54acc7d2c1190d2d997a0d1c3ce +Subproject commit 7d4c8b82348a8ef2efb7772d16e0b575051a683e diff --git a/qtsvg b/qtsvg index d439739e15c..6de62741019 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit d439739e15c100f257a1a1842770c4282dc9666e +Subproject commit 6de62741019a1686e0af5d4e78b5d0f50fa18853 diff --git a/qttools b/qttools index d4342ab7e82..c9e9fd967b3 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d4342ab7e827960c417f9aa60340e8a56ff5a1c9 +Subproject commit c9e9fd967b38f975e7c5743b7f5c4316df99121e diff --git a/qttranslations b/qttranslations index ae7c48d0547..d350bec8d13 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit ae7c48d0547391b6a247e3365f084292e8af6ec9 +Subproject commit d350bec8d135f7080291c89b32266fc1e7873244 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index a5442ee7e44..c20945c93a3 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit a5442ee7e44f8907635709269661d430b4141e37 +Subproject commit c20945c93a3d522468af343b2a82c1b69b433abe diff --git a/qtwayland b/qtwayland index eaeb21284ab..ef0eeff3783 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit eaeb21284ab7a3714c735ee8d7c348aa3bc3a07a +Subproject commit ef0eeff3783ff81ed4146a58597beaa9199ea323 diff --git a/qtwebengine b/qtwebengine index 027cce270ae..f41dbaad0f0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 027cce270aea504308e123988dfb5cd1658687d7 +Subproject commit f41dbaad0f0b554b3168df5456e57c3016bd5e43 diff --git a/qtwebsockets b/qtwebsockets index 34010e64973..57e447f19af 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 34010e649734fe7a41d1a0280c606b15de5c2799 +Subproject commit 57e447f19afb9fa58add302547c966e6f5c3b16f diff --git a/qtwebview b/qtwebview index 1b514c3b7d1..48f2622cde5 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 1b514c3b7d1b5d6ddfbfd818cf878a425d2b5f8b +Subproject commit 48f2622cde5923d07d8b11e254079309a20e7f41 From 192bd350fbc9c9f1b500a7abbf06c1bcaa36538e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 6 Jul 2020 23:46:14 +0200 Subject: [PATCH 002/106] Update submodules on '5.15' in qt/qt5 Change-Id: Ifb0cc0c2a50d82661972861d80b447fb80c92706 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtqa | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 81ce2d1d6fa..bcd544bd7cb 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 81ce2d1d6fa741de4d27b939a378147a02019ec1 +Subproject commit bcd544bd7cbf15a7e852852ec83eb9fdd242a0d3 diff --git a/qtqa b/qtqa index f32511d58ba..f5f35ce2a43 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit f32511d58ba5593e4e92db0cfff323a616f591f1 +Subproject commit f5f35ce2a43ebbb3c392adb44b89f4f7b7cd301e diff --git a/qtwebengine b/qtwebengine index f41dbaad0f0..aa3052f72a5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f41dbaad0f0b554b3168df5456e57c3016bd5e43 +Subproject commit aa3052f72a5b4980010e42939baf26f068d8a9e3 From f399972a0d8eb00923b0bdad7cedfe5a5552c849 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 9 Jul 2020 23:46:22 +0200 Subject: [PATCH 003/106] Update submodules on '5.15' in qt/qt5 Change-Id: I00030b79499d047c86c451b1151e13745a76102a Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qttools | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index bcd544bd7cb..9d87528eb6a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bcd544bd7cbf15a7e852852ec83eb9fdd242a0d3 +Subproject commit 9d87528eb6a7eb48763d41c7bff6a532f98708cd diff --git a/qtdeclarative b/qtdeclarative index 749ca5d0272..a99fa4cb4ca 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 749ca5d0272eec49c2986eecebe897d311cbf372 +Subproject commit a99fa4cb4ca1f834235a819bb823b135d0d0203a diff --git a/qttools b/qttools index c9e9fd967b3..c806adb2924 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c9e9fd967b38f975e7c5743b7f5c4316df99121e +Subproject commit c806adb2924a6ba7a6c40ec0a664f326d5cb06fb diff --git a/qtwebengine b/qtwebengine index aa3052f72a5..adb616477f3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit aa3052f72a5b4980010e42939baf26f068d8a9e3 +Subproject commit adb616477f33d59c825d6b875bf4d8d975c009d9 From 093f748d824b61582e403720adb0ca9f2b08f4b6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 15 Jul 2020 23:46:38 +0200 Subject: [PATCH 004/106] Update submodules on '5.15' in qt/qt5 Change-Id: I7279bdd01f6cb8017ce6e07d7f5dd687ea26d7b6 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtx11extras | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index 85c21500c52..a622e52d291 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 85c21500c52fe4cbfa1aa9d556296f85abc062b9 +Subproject commit a622e52d29146fe229928d398ebb50373279ae15 diff --git a/qtactiveqt b/qtactiveqt index cddd08a9ed9..e9ee58208f5 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit cddd08a9ed92aff9f86b0fde86cfac980bec52ea +Subproject commit e9ee58208f5eea55e5225513f1403a27dbdd2d60 diff --git a/qtbase b/qtbase index 9d87528eb6a..7fbf1f87db3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9d87528eb6a7eb48763d41c7bff6a532f98708cd +Subproject commit 7fbf1f87db3109d35cbdd4752c7a6e5bd7fce5eb diff --git a/qtmultimedia b/qtmultimedia index 99db82a9936..d20d3c1b799 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 99db82a99363a8819b7c1600c565d37b48409fbf +Subproject commit d20d3c1b799f57b57de1d6c97dbc3c457444df96 diff --git a/qtqa b/qtqa index f5f35ce2a43..16b7ec6c434 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit f5f35ce2a43ebbb3c392adb44b89f4f7b7cd301e +Subproject commit 16b7ec6c43480cead4d5830e6226fa09643225e2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index f66d6116b0f..9322c67c428 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit f66d6116b0fb84982b004e282bea9bfcfbc1f950 +Subproject commit 9322c67c4281b5d5e4941f9072547fe8054d0f36 diff --git a/qtrepotools b/qtrepotools index 7d4c8b82348..a94d99a147e 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 7d4c8b82348a8ef2efb7772d16e0b575051a683e +Subproject commit a94d99a147e1c48125ed1a8795f969f44c75df70 diff --git a/qtserialport b/qtserialport index 49335de3e76..f2fe2d2e25f 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 49335de3e7690ae6d7992dace29b86ef4ae246d1 +Subproject commit f2fe2d2e25f61da19ba4205968e5bfa29ef86b64 diff --git a/qtsvg b/qtsvg index 6de62741019..54281df2744 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 6de62741019a1686e0af5d4e78b5d0f50fa18853 +Subproject commit 54281df2744b4b789906265153556d2c60a31362 diff --git a/qttools b/qttools index c806adb2924..70ec38e5242 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c806adb2924a6ba7a6c40ec0a664f326d5cb06fb +Subproject commit 70ec38e5242e72b25c0df085b9e87acdbdc2e0d2 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index c20945c93a3..5377bb3ce3e 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit c20945c93a3d522468af343b2a82c1b69b433abe +Subproject commit 5377bb3ce3e69640dc3ac484e977704470ad7965 diff --git a/qtwebchannel b/qtwebchannel index 3342da90895..ed798d76d66 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 3342da908955187a4543cdc38e0fad2e78e936e7 +Subproject commit ed798d76d6618d0deffb3916ca27ccad8252be68 diff --git a/qtwebengine b/qtwebengine index adb616477f3..9a90cd56c43 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit adb616477f33d59c825d6b875bf4d8d975c009d9 +Subproject commit 9a90cd56c432f2ad3e811449cb199b11c6ed9de8 diff --git a/qtx11extras b/qtx11extras index 17a9d40a3e8..bdca154ef2e 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 17a9d40a3e808145aef8de08b79d21cf7df45421 +Subproject commit bdca154ef2ef22034202aae55a7f16e6c0fa5e85 From 73765a68851ca2cb23b99471d2082efe722d8d5d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 16 Jul 2020 23:46:24 +0200 Subject: [PATCH 005/106] Update submodules on '5.15' in qt/qt5 Change-Id: Ifd9cc2d935c93978ae6e2d115dfc184bb02af4b2 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtsvg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qt3d b/qt3d index a622e52d291..923c00c21a7 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a622e52d29146fe229928d398ebb50373279ae15 +Subproject commit 923c00c21a78dca999bf66ec3ea2888de9beee85 diff --git a/qtbase b/qtbase index 7fbf1f87db3..8a2affe5c51 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7fbf1f87db3109d35cbdd4752c7a6e5bd7fce5eb +Subproject commit 8a2affe5c51816ff5679f03d971baefd9ae31977 diff --git a/qtsvg b/qtsvg index 54281df2744..3e5226908cb 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 54281df2744b4b789906265153556d2c60a31362 +Subproject commit 3e5226908cba0fc314c95bf7672f31443e3dee9f From 7339218edd6c91688c2eac8c41be1d72950f7def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 5 Dec 2019 15:05:20 +0200 Subject: [PATCH 006/106] Provisioning: Install Python 3.8 for testing Qt for Python This installs Python 3.8.1 to be used with Qt for Python. It keeps the old 3.6 as a default python3. Change-Id: I8ea121514f6a4092f700688363c282cbea37a75b Reviewed-by: Toni Saario (cherry picked from commit 607b33aab2477f49eeb08b780ff9962d4e4f2a04) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/windows/python3.ps1 | 26 ++++++++++++------- .../qtci-windows-10-x86_64/08-python3-32.ps1 | 1 - .../qtci-windows-10-x86_64/08-python3.ps1 | 13 +++++++++- 3 files changed, 29 insertions(+), 11 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 diff --git a/coin/provisioning/common/windows/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 index 8fbd615c0c5..9eba058cabf 100644 --- a/coin/provisioning/common/windows/python3.ps1 +++ b/coin/provisioning/common/windows/python3.ps1 @@ -35,12 +35,14 @@ # This script installs Python $version. # Python3 is required for building some qt modules. param( - [Int32]$archVer=32, - [string]$install_path = "C:\Python36" + [Int32]$archVer, + [string]$sha1, + [string]$install_path, + [string]$version, + [bool]$setDefault=$false ) . "$PSScriptRoot\helpers.ps1" -$version = "3.6.1" $package = "C:\Windows\temp\python-$version.exe" # check bit version @@ -48,11 +50,9 @@ if ( $archVer -eq 64 ) { Write-Host "Installing 64 bit Python" $externalUrl = "https://www.python.org/ftp/python/$version/python-$version-amd64.exe" $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version-amd64.exe" - $sha1 = "bf54252c4065b20f4a111cc39cf5215fb1edccff" } else { $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.exe" $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version.exe" - $sha1 = "76c50b747237a0974126dd8b32ea036dd77b2ad1" } Write-Host "Fetching from URL..." @@ -65,11 +65,19 @@ Remove-Item -Path $package # For cross-compilation we export some helper env variable if (($archVer -eq 32) -And (Is64BitWinHost)) { - Set-EnvironmentVariable "PYTHON3_32_PATH" "$install_path" - Set-EnvironmentVariable "PIP3_32_PATH" "$install_path\Scripts" + if ($setDefault) { + Set-EnvironmentVariable "PYTHON3_32_PATH" "$install_path" + Set-EnvironmentVariable "PIP3_32_PATH" "$install_path\Scripts" + } + Set-EnvironmentVariable "PYTHON$version-32_PATH" "$install_path" + Set-EnvironmentVariable "PIP$version-32_PATH" "$install_path\Scripts" } else { - Set-EnvironmentVariable "PYTHON3_PATH" "$install_path" - Set-EnvironmentVariable "PIP3_PATH" "$install_path\Scripts" + if ($setDefault) { + Set-EnvironmentVariable "PYTHON3_PATH" "$install_path" + Set-EnvironmentVariable "PIP3_PATH" "$install_path\Scripts" + } + Set-EnvironmentVariable "PYTHON$version-64_PATH" "$install_path" + Set-EnvironmentVariable "PIP$version-64_PATH" "$install_path\Scripts" } diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 deleted file mode 100644 index 5ffeab3bea3..00000000000 --- a/coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "C:\Python36_32" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 index 3201032d352..0ab0ed39448 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 @@ -1 +1,12 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" 64 +# Parameters: +# - Arch 32/64 +# - installer sha1 +# - install target dir +# - version +# - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false + +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a8ac14ee5486547caf84abdf151be22d9d069c0a" "C:\Python38_64" "3.8.1" +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "14ff2c2e5538b03a012cb4c9d519d970444ebd42" "C:\Python38_32" "3.8.1" +# default ones +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "bf54252c4065b20f4a111cc39cf5215fb1edccff" "C:\Python36" "3.6.1" $true +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "76c50b747237a0974126dd8b32ea036dd77b2ad1" "C:\Python36_32" "3.6.1" $true From 5442f9a23a054f6beb4887173c430b42d0695768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Fri, 17 Jul 2020 08:16:59 +0300 Subject: [PATCH 007/106] Provisioning: Fix Python3 install PS script usage Change-Id: I843c861804cf70b91553fac680797550a4f4af64 Reviewed-by: Toni Saario --- coin/provisioning/qtci-windows-7-x86/08-python3.ps1 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 index 998e6bae70b..9446a32f55c 100644 --- a/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 @@ -1 +1,8 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" +# Parameters: +# - Arch 32/64 +# - installer sha1 +# - install target dir +# - version +# - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false + +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "76c50b747237a0974126dd8b32ea036dd77b2ad1" "C:\Python36" "3.6.1" $true From 93a2636e0f978a142e1a9c95a9b309bb6eb56b28 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 17 Jul 2020 23:46:24 +0200 Subject: [PATCH 008/106] Update submodules on '5.15' in qt/qt5 Change-Id: I68ecb37a35622c14aea12aac3a32e5ed9f15f764 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtsvg | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 8a2affe5c51..b3b21b1a30e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8a2affe5c51816ff5679f03d971baefd9ae31977 +Subproject commit b3b21b1a30e5375a327cc09313ada8d42bdf2164 diff --git a/qtsvg b/qtsvg index 3e5226908cb..45548ffe73f 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 3e5226908cba0fc314c95bf7672f31443e3dee9f +Subproject commit 45548ffe73f194501667a8cf982525c146e87285 diff --git a/qtwebengine b/qtwebengine index 9a90cd56c43..060c09b23b9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9a90cd56c432f2ad3e811449cb199b11c6ed9de8 +Subproject commit 060c09b23b9ec0376fa7fd687d1f853660410f2a From 9972ae9fb665f4b0a232f55de4f3ac4ffa229c25 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 18 Jul 2020 23:46:56 +0200 Subject: [PATCH 009/106] Update submodules on '5.15' in qt/qt5 Change-Id: Ic0b50278e902cc323f154d4d57be6e5de16f7742 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdoc | 2 +- qtquickcontrols | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index b3b21b1a30e..202496f965d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b3b21b1a30e5375a327cc09313ada8d42bdf2164 +Subproject commit 202496f965dc42ebd8b9804d0accddceb341e7f1 diff --git a/qtdoc b/qtdoc index 0dcb328b033..f440a3e1ed0 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0dcb328b0332f2b438f00f365fb8d5707ea73339 +Subproject commit f440a3e1ed071310f03ccd478ff3b6148d1cf84b diff --git a/qtquickcontrols b/qtquickcontrols index e5fb9e4ceab..5a20af684cf 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit e5fb9e4ceabc2f1bfd89d3b3cb0a69c7d74df5b8 +Subproject commit 5a20af684cf61192d4823869c3a55af7b3c0141e From ac1bc46838434bfccc2266ab8c029c71973ad648 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 20 Jul 2020 23:45:52 +0200 Subject: [PATCH 010/106] Update submodules on '5.15' in qt/qt5 Change-Id: Iab2c72e5478cca49622c4c32803a4c252cb051fc Reviewed-by: Qt Submodule Update Bot --- qtmultimedia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtmultimedia b/qtmultimedia index d20d3c1b799..13843ca8a1f 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d20d3c1b799f57b57de1d6c97dbc3c457444df96 +Subproject commit 13843ca8a1f33b015e9347e4955b34d8711fdbfd From b6363e91e934d00d18d9f174b756fce40c3dc57a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 21 Jul 2020 08:28:08 +0300 Subject: [PATCH 011/106] Provisioning: Fix Python3 install in 32 bit win10 There is no 32 bit win10 configurations in CI, so we do not verify any of the provisioning changes on it. Change-Id: I1c1e183908ffb09be4e2992ccbd1da7af2640181 Reviewed-by: Toni Saario (cherry picked from commit bdea3c816415f6c7c1c6d1b2a7e41de70e66d44c) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-windows-10-x86/08-python3.ps1 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 index 998e6bae70b..9446a32f55c 100644 --- a/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 @@ -1 +1,8 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" +# Parameters: +# - Arch 32/64 +# - installer sha1 +# - install target dir +# - version +# - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false + +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "76c50b747237a0974126dd8b32ea036dd77b2ad1" "C:\Python36" "3.6.1" $true From 44fe19f004353fb07138331ae81ec7277f8d66a9 Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Wed, 22 Jul 2020 08:15:26 +0300 Subject: [PATCH 012/106] Provisioning: Add delay after network setting change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In many cases without waiting, next script would be missing network and fails. Change-Id: Iab50945716860618b495029ce179183d844dc98a Reviewed-by: Simo Fält (cherry picked from commit 3271bb2fe219d68fc83a7cf8de702b0468e530bb) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/windows/disable-netadapterlso.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/common/windows/disable-netadapterlso.ps1 b/coin/provisioning/common/windows/disable-netadapterlso.ps1 index ca7ad3ca656..36fff06e847 100644 --- a/coin/provisioning/common/windows/disable-netadapterlso.ps1 +++ b/coin/provisioning/common/windows/disable-netadapterlso.ps1 @@ -1 +1,2 @@ Disable-NetAdapterLso Ethernet +Start-Sleep -s 15 # Give windows some time to adjust network settings From c129f9983d432211ffd6be3f4b50fb9426f044f5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 26 Jul 2020 23:45:47 +0200 Subject: [PATCH 013/106] Update submodules on '5.15' in qt/qt5 Change-Id: Icfe485415e0e4309e65389e79fba92c725bebc3a Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtqa | 2 +- qtsvg | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 202496f965d..3cb77ed5e7a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 202496f965dc42ebd8b9804d0accddceb341e7f1 +Subproject commit 3cb77ed5e7a840a98bd6b3e79cb2110f94c5573e diff --git a/qtdeclarative b/qtdeclarative index a99fa4cb4ca..fdbe0f21744 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a99fa4cb4ca1f834235a819bb823b135d0d0203a +Subproject commit fdbe0f21744a1cc1785cd10346437b03029fe65d diff --git a/qtlocation b/qtlocation index e73246b0e57..7b92fd72ab3 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e73246b0e575a14bd88a84f67543b7e9b50960d5 +Subproject commit 7b92fd72ab325914427dfadcc5f9c02591bda649 diff --git a/qtqa b/qtqa index 16b7ec6c434..502b4bf4e77 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 16b7ec6c43480cead4d5830e6226fa09643225e2 +Subproject commit 502b4bf4e777c06c6d48747b8a25a93a904c3107 diff --git a/qtsvg b/qtsvg index 45548ffe73f..f451c700b5c 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 45548ffe73f194501667a8cf982525c146e87285 +Subproject commit f451c700b5ce3c77bcaf09410bdff8b3bd8a81dd diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 5377bb3ce3e..51d0e4154a7 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 5377bb3ce3e69640dc3ac484e977704470ad7965 +Subproject commit 51d0e4154a75a45740aa66849b289b7e630916aa diff --git a/qtwebengine b/qtwebengine index 060c09b23b9..a2a19a69656 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 060c09b23b9ec0376fa7fd687d1f853660410f2a +Subproject commit a2a19a6965601ced75e3e48b2bf618ba2bdbd29e From 8c7592b5c4996b8f51d383c202779475eab50bfe Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 27 Jul 2020 23:46:20 +0200 Subject: [PATCH 014/106] Update submodules on '5.15' in qt/qt5 Change-Id: I9ea6466cfc310be49b31a9bda80e4fb0434335c0 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qttools | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 3cb77ed5e7a..81cd63dc293 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3cb77ed5e7a840a98bd6b3e79cb2110f94c5573e +Subproject commit 81cd63dc293ef577621c04b0b5889017c1bf2011 diff --git a/qtdeclarative b/qtdeclarative index fdbe0f21744..c551d02cb0f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fdbe0f21744a1cc1785cd10346437b03029fe65d +Subproject commit c551d02cb0fec2f3d753beb4ec38c14843518c33 diff --git a/qtqa b/qtqa index 502b4bf4e77..bfbefebe980 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 502b4bf4e777c06c6d48747b8a25a93a904c3107 +Subproject commit bfbefebe98088aa9e23f51bce09b4d3fc5c5ddba diff --git a/qttools b/qttools index 70ec38e5242..cb245b73ef3 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 70ec38e5242e72b25c0df085b9e87acdbdc2e0d2 +Subproject commit cb245b73ef3b20ddf152b51d93a474965eedab4e diff --git a/qtwebengine b/qtwebengine index a2a19a69656..a283bf53c4c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a2a19a6965601ced75e3e48b2bf618ba2bdbd29e +Subproject commit a283bf53c4cc81ec14d19a492c412191394b350c From a8f008d5a5d7cfe6640e7736a1980a89a1991872 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 28 Jul 2020 23:46:11 +0200 Subject: [PATCH 015/106] Update submodules on '5.15' in qt/qt5 Change-Id: I77111de046ac4b5bef24a0eb09cb0eb4c3ecf39e Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtremoteobjects | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 81cd63dc293..817ca302634 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 81cd63dc293ef577621c04b0b5889017c1bf2011 +Subproject commit 817ca3026349d7c303d9b6b66ba36f2ea1b5bfd5 diff --git a/qtqa b/qtqa index bfbefebe980..39996088264 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit bfbefebe98088aa9e23f51bce09b4d3fc5c5ddba +Subproject commit 39996088264e50821c1caeb33c5d884a57a0b6ac diff --git a/qtquick3d b/qtquick3d index 45b3b76a952..edbe76406bd 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 45b3b76a9529e31fc1b0d7423400d9a76cfef67d +Subproject commit edbe76406bd401e0b85952481be2e81ecd9452d1 diff --git a/qtremoteobjects b/qtremoteobjects index d4957cd786a..5e3e526f597 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit d4957cd786ac95337abf9a66e93dbce08c1a9f92 +Subproject commit 5e3e526f597b9e4b5b0336d1f816629724c0689f From 8066f8ef9fb23625378263986b68b53278c677b1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 29 Jul 2020 23:46:09 +0200 Subject: [PATCH 016/106] Update submodules on '5.15' in qt/qt5 Change-Id: Ia0b40c1573d9357fe7b927c92f425b5ddb6b7be4 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtsvg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 817ca302634..34d94242e9a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 817ca3026349d7c303d9b6b66ba36f2ea1b5bfd5 +Subproject commit 34d94242e9a81e28989486dd232880dcd830217c diff --git a/qtsvg b/qtsvg index f451c700b5c..91e91d7636b 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f451c700b5ce3c77bcaf09410bdff8b3bd8a81dd +Subproject commit 91e91d7636b27c02058dee519bf9c52e3b698ab2 From 49825be2dc88a7c5fb4a1ab66d0789429bf72685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 30 Jul 2020 09:10:58 +0300 Subject: [PATCH 017/106] Provisioning: Fix PYTHON3_WHEEL_CACHE pointing to wrong dir Earlier we set the env variable point to latest Python install. It did work by accident, while the default python was installed as last. Now each python install has its own matching ENV variable that can be used buildtime. The PYTHON3_WHEEL_CACHE will now point to 64 bit default Python3, while the variable is already used in Qt codebase. Change-Id: I6a67936c06ed0209ef9e903120f2416aaa8eb3ff Reviewed-by: Assam Boudjelthia (cherry picked from commit 969acbce6e9b1ac1c270363aafc8b20a1f4ee8ff) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/windows/python3.ps1 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/windows/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 index 9eba058cabf..58cd25c52db 100644 --- a/coin/provisioning/common/windows/python3.ps1 +++ b/coin/provisioning/common/windows/python3.ps1 @@ -96,7 +96,13 @@ Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv wh # Install all needed packages in a special wheel cache directory $python3_wheel_dir="$install_path\python3-wheels" Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args wheel --wheel-dir $python3_wheel_dir -r $PSScriptRoot\..\shared\requirements.txt" -Set-EnvironmentVariable "PYTHON3_WHEEL_CACHE" "$python3_wheel_dir" + +Set-EnvironmentVariable "PYTHON3_WHEEL_CACHE-$version-$archVer" "$python3_wheel_dir" +# PYTHON3_WHEEL_CACHE is already in use so we should keep it pointing to 64 bit default +# wheel cache +if (($setDefault) -And ($archVer -eq 64)) { + Set-EnvironmentVariable "PYTHON3_WHEEL_CACHE" "$python3_wheel_dir" +} # Install PyPDF2 for QSR documentation Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install PyPDF2" From b2ca6cf26b36649f1dea5556a86b496ef3e5fa93 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 4 Aug 2020 23:46:31 +0200 Subject: [PATCH 018/106] Update submodules on '5.15' in qt/qt5 Change-Id: I5c9816e36ce8af564e3cedd42315b3a84341e486 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/qt3d b/qt3d index 923c00c21a7..b3ad79419b0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 923c00c21a78dca999bf66ec3ea2888de9beee85 +Subproject commit b3ad79419b038b41cc7d6460131b302ba562a4fe diff --git a/qtactiveqt b/qtactiveqt index e9ee58208f5..2535f7d0034 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit e9ee58208f5eea55e5225513f1403a27dbdd2d60 +Subproject commit 2535f7d0034c03500dd279e735f97941d4d051f4 diff --git a/qtandroidextras b/qtandroidextras index 73684040207..32b7e00d6da 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 73684040207ce0cbb782dda5dc27cb8ac71243b3 +Subproject commit 32b7e00d6da531dabc231af17c70e3bc06f823e3 diff --git a/qtbase b/qtbase index 34d94242e9a..5826a7ad921 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 34d94242e9a81e28989486dd232880dcd830217c +Subproject commit 5826a7ad921930393c84b790123f493e26d0685c diff --git a/qtcharts b/qtcharts index b1edcbc8b04..e073beeb071 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit b1edcbc8b040455b76b1ac3c1762867c88e76287 +Subproject commit e073beeb0710913cd5faa0b2f570ca8383c58322 diff --git a/qtconnectivity b/qtconnectivity index be75143e7d6..70d9d0ce58a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit be75143e7d6d74bf49284746afcbe26c8091f471 +Subproject commit 70d9d0ce58a88ce3c2e8673e8ea20ba078632e25 diff --git a/qtdatavis3d b/qtdatavis3d index 8ea21240c33..fe5eb952c48 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 8ea21240c33ded74bc30f1dd2accf5718eb07574 +Subproject commit fe5eb952c4811adfee9ef7e37463039d879774ff diff --git a/qtdeclarative b/qtdeclarative index c551d02cb0f..4825b69e054 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c551d02cb0fec2f3d753beb4ec38c14843518c33 +Subproject commit 4825b69e054284d8e4d9cd91ac87d307b1431625 diff --git a/qtdoc b/qtdoc index f440a3e1ed0..9c83b672f14 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f440a3e1ed071310f03ccd478ff3b6148d1cf84b +Subproject commit 9c83b672f144fc5b099ad28f5f170b2801e86b2d diff --git a/qtgamepad b/qtgamepad index f1e9844fa72..4efe2111788 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit f1e9844fa72f755efdf52040cd08844a7a46a3e7 +Subproject commit 4efe211178849a058a2d670884359043ce56c2ec diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 83e9a15a523..c1d206d0c30 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 83e9a15a523e86718f99d47d5b3b516ab95d5ae2 +Subproject commit c1d206d0c30925c2bee248e2c5a33b22abf72a94 diff --git a/qtimageformats b/qtimageformats index 1a790ba6151..b179695c8e1 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 1a790ba6151a3128b49d3dc556d3373dbda9f9d1 +Subproject commit b179695c8e157bdd5e3e31980d5a8b435a7c6c52 diff --git a/qtlocation b/qtlocation index 7b92fd72ab3..4b48bfe133c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 7b92fd72ab325914427dfadcc5f9c02591bda649 +Subproject commit 4b48bfe133c5a9b5b257373e58c405f37d4b9d03 diff --git a/qtlottie b/qtlottie index 43c7e0a05fd..2245b587f16 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 43c7e0a05fd350c1bbcd3127307906bba7c12d0b +Subproject commit 2245b587f162f8d7a152049832739af9700e7c2d diff --git a/qtmacextras b/qtmacextras index 061b6abfc23..8a8ae8fa2c8 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 061b6abfc2309e9d513cfa758b0201985b3f1a6d +Subproject commit 8a8ae8fa2c8cfc94e06a3da0a260ffbae6c7e836 diff --git a/qtmultimedia b/qtmultimedia index 13843ca8a1f..a0202e658be 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 13843ca8a1f33b015e9347e4955b34d8711fdbfd +Subproject commit a0202e658becd9a07a93574c4f13cf43c21325fd diff --git a/qtnetworkauth b/qtnetworkauth index 9f6f71d7b1e..eacb61f5b18 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 9f6f71d7b1eaf7821a0083894863b1b3d2a1e3ef +Subproject commit eacb61f5b180c676b53881a1fbd73339c3e5f303 diff --git a/qtpurchasing b/qtpurchasing index ac5a9b9615b..1dc083d1aa8 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit ac5a9b9615ba80e5b7b57c689cfba2b657b4e612 +Subproject commit 1dc083d1aa85a645e933403b7bcfadf78e5d601f diff --git a/qtqa b/qtqa index 39996088264..44e856ce375 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 39996088264e50821c1caeb33c5d884a57a0b6ac +Subproject commit 44e856ce375a26c07a80284fbb2c35ecb70250cb diff --git a/qtquick3d b/qtquick3d index edbe76406bd..0aabccab2cb 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit edbe76406bd401e0b85952481be2e81ecd9452d1 +Subproject commit 0aabccab2cb502b47508e9eef41a7e0d74aac9e0 diff --git a/qtquickcontrols b/qtquickcontrols index 5a20af684cf..1c58ef02d27 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5a20af684cf61192d4823869c3a55af7b3c0141e +Subproject commit 1c58ef02d27023a0ee1d47a71368021bd6a6898d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9322c67c428..b6dc9d05210 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9322c67c4281b5d5e4941f9072547fe8054d0f36 +Subproject commit b6dc9d05210a627a25f1ef05397e27a67c7f2f7c diff --git a/qtquicktimeline b/qtquicktimeline index e993bd51b8a..ef794d231f7 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit e993bd51b8a6a4dcab9303b9e1991a271e086c60 +Subproject commit ef794d231f70cc0490d9f184782ab132ebeedde7 diff --git a/qtremoteobjects b/qtremoteobjects index 5e3e526f597..3918dc3bb2a 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 5e3e526f597b9e4b5b0336d1f816629724c0689f +Subproject commit 3918dc3bb2a89f8d2eae4ca3dfab284d02011bfa diff --git a/qtscript b/qtscript index 0f6ea351526..e74e5985da8 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 0f6ea3515260438b3a51bc6e4d4e4480261484ff +Subproject commit e74e5985da8ad849116c0b99aca3a603e501c9e2 diff --git a/qtscxml b/qtscxml index a11be672551..53b71057390 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit a11be67255140abd48f91a3d5f7ae4c3ee8e4341 +Subproject commit 53b71057390a31532517fead1eda1be2c503f6ef diff --git a/qtsensors b/qtsensors index be24a7a43cf..59e02539cf0 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit be24a7a43cfe4db4c9a9d95f9321c8abec3b0ae7 +Subproject commit 59e02539cf0f94bcdd0a1548a4d9234f47e09653 diff --git a/qtserialbus b/qtserialbus index c12af883238..5cfa90e87f7 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c12af8832389785b8be7ffcdddcdb8480c1e124d +Subproject commit 5cfa90e87f7d6e54b16cbfcc1544e17ca944e62a diff --git a/qtserialport b/qtserialport index f2fe2d2e25f..4d85b8ede2e 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f2fe2d2e25f61da19ba4205968e5bfa29ef86b64 +Subproject commit 4d85b8ede2ea521dd1a1fae7221293d57d0169be diff --git a/qtspeech b/qtspeech index 919fabda135..b8fde373709 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 919fabda135581968dce297b62eb9b69da7a772f +Subproject commit b8fde373709585685125d3f417b3d646746d3236 diff --git a/qtsvg b/qtsvg index 91e91d7636b..9d021799014 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 91e91d7636b27c02058dee519bf9c52e3b698ab2 +Subproject commit 9d0217990141e793170c1b5cd5a139e6bffa14eb diff --git a/qttools b/qttools index cb245b73ef3..aabba72f796 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit cb245b73ef3b20ddf152b51d93a474965eedab4e +Subproject commit aabba72f7965e06e2e6ed960d8cf8078249dac8c diff --git a/qttranslations b/qttranslations index d350bec8d13..ec3a7a623ae 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit d350bec8d135f7080291c89b32266fc1e7873244 +Subproject commit ec3a7a623ae7dc228e7a9795a605c6d7916816ec diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 51d0e4154a7..99008fa890e 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 51d0e4154a75a45740aa66849b289b7e630916aa +Subproject commit 99008fa890eab8738fb6676f5df0101ae4467f4a diff --git a/qtwayland b/qtwayland index ef0eeff3783..9380c33a718 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit ef0eeff3783ff81ed4146a58597beaa9199ea323 +Subproject commit 9380c33a718d475007d3f2955349d336267f274e diff --git a/qtwebchannel b/qtwebchannel index ed798d76d66..37501a49ef9 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit ed798d76d6618d0deffb3916ca27ccad8252be68 +Subproject commit 37501a49ef9d61f3e6af9d08eee89ffddf9da489 diff --git a/qtwebengine b/qtwebengine index a283bf53c4c..001ef20a827 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a283bf53c4cc81ec14d19a492c412191394b350c +Subproject commit 001ef20a82749e58295a706d6b075cdcb74f1621 diff --git a/qtwebglplugin b/qtwebglplugin index 5488f0731eb..267fba6fdb2 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 5488f0731ebe9c5566abb897f0cb8d298c5944da +Subproject commit 267fba6fdb275601d2a61195ae0260f94f786cff diff --git a/qtwebsockets b/qtwebsockets index 57e447f19af..c5cad78cc06 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 57e447f19afb9fa58add302547c966e6f5c3b16f +Subproject commit c5cad78cc060ddc354647123bf69036a2ef00b33 diff --git a/qtwebview b/qtwebview index 48f2622cde5..4598b0b1a5d 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 48f2622cde5923d07d8b11e254079309a20e7f41 +Subproject commit 4598b0b1a5de36007ab390ffbecd5df3d53add61 diff --git a/qtwinextras b/qtwinextras index b8d402e1436..ed12055dcc8 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit b8d402e143627916214b1a7552da9d84920063c6 +Subproject commit ed12055dcc8c089bfe88b08842d2f16dd266545c diff --git a/qtx11extras b/qtx11extras index bdca154ef2e..59b3f803838 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit bdca154ef2ef22034202aae55a7f16e6c0fa5e85 +Subproject commit 59b3f8038383480b5e1c1cb31e0de0ebd6a095ba diff --git a/qtxmlpatterns b/qtxmlpatterns index 0c04a447ca5..dcd7355bb9e 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 0c04a447ca53642e33fde1f4ada6debc435837e7 +Subproject commit dcd7355bb9ea7e7f7f788a2e00fdf5fb48ae70b3 From 27ffd5c6b286af2ec35f2301547c8a22cff71e0c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 5 Aug 2020 23:46:35 +0200 Subject: [PATCH 019/106] Update submodules on '5.15' in qt/qt5 Change-Id: I4c68c3e5623145f217fa2d3572beeaaaa62c0efb Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtquick3d | 2 +- qtspeech | 2 +- qttools | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 5826a7ad921..8ce5eec5e00 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5826a7ad921930393c84b790123f493e26d0685c +Subproject commit 8ce5eec5e00ee37b6db138aae0389062190c512a diff --git a/qtquick3d b/qtquick3d index 0aabccab2cb..0d63d1f971d 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 0aabccab2cb502b47508e9eef41a7e0d74aac9e0 +Subproject commit 0d63d1f971d5fd4e087ad893c0561cf341316adc diff --git a/qtspeech b/qtspeech index b8fde373709..615ff28f6fe 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit b8fde373709585685125d3f417b3d646746d3236 +Subproject commit 615ff28f6fe9083b29df9ca3fa0d123817944e0c diff --git a/qttools b/qttools index aabba72f796..4588e08b95f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit aabba72f7965e06e2e6ed960d8cf8078249dac8c +Subproject commit 4588e08b95f2c50dcdd9f7ab78062752afa0138b From e5488354ca931e9f3b46c8d0b033ddaeac630b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 12 Mar 2020 10:09:25 +0000 Subject: [PATCH 020/106] Enable autotests on SLES 15 and mark it insignificant Task-number: QTQAINFRA-2852 Task-number: QTQAINFRA-3872 Change-Id: I19fbd4907b3c3846c6eac245b48ff887015e5520 Reviewed-by: Heikki Halmet Reviewed-by: Toni Saario --- coin/platform_configs/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 296fdf52186..eb7bfd456bc 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -73,7 +73,7 @@ Configurations: - Template: 'qtci-linux-SLES-15-x86_64' Compiler: 'GCC' - Features: ['DisableTests'] + Features: ['Insignificant'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - Template: 'qtci-linux-RHEL-7.6-x86_64' From f524b6a79d2a8beadc7e11424f8f875432969197 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 19 Aug 2020 23:46:30 +0200 Subject: [PATCH 021/106] Update submodules on '5.15' in qt/qt5 Change-Id: Ic44cdbb7948ddaa74d1ee561676f8298cacff400 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtxmlpatterns | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/qtbase b/qtbase index 8ce5eec5e00..1f3f4965f54 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8ce5eec5e00ee37b6db138aae0389062190c512a +Subproject commit 1f3f4965f54856366c065d5ff149e609066ac989 diff --git a/qtconnectivity b/qtconnectivity index 70d9d0ce58a..7a160b16dea 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 70d9d0ce58a88ce3c2e8673e8ea20ba078632e25 +Subproject commit 7a160b16dea1fa26b58f8b2e7c2fc6c96813bfd2 diff --git a/qtdeclarative b/qtdeclarative index 4825b69e054..cc0cb02da6f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4825b69e054284d8e4d9cd91ac87d307b1431625 +Subproject commit cc0cb02da6fda1af6e6cd4a27d1fb8962f9ecb6e diff --git a/qtdoc b/qtdoc index 9c83b672f14..a43c74bc1c8 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9c83b672f144fc5b099ad28f5f170b2801e86b2d +Subproject commit a43c74bc1c8d672f7137a7e1ca0dad687a64e73e diff --git a/qtimageformats b/qtimageformats index b179695c8e1..bd735210708 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit b179695c8e157bdd5e3e31980d5a8b435a7c6c52 +Subproject commit bd735210708a675086a6fa4533b0aea3c0c16dd4 diff --git a/qtlocation b/qtlocation index 4b48bfe133c..eed38a67e75 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 4b48bfe133c5a9b5b257373e58c405f37d4b9d03 +Subproject commit eed38a67e759f660462e5cd233c73f07e0cfb59f diff --git a/qtqa b/qtqa index 44e856ce375..def7ffd01ce 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 44e856ce375a26c07a80284fbb2c35ecb70250cb +Subproject commit def7ffd01ce5830ba20bb876924f5118aaa92e60 diff --git a/qtquick3d b/qtquick3d index 0d63d1f971d..003a8efcd55 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 0d63d1f971d5fd4e087ad893c0561cf341316adc +Subproject commit 003a8efcd55777ce2e26f21d1ebd51f615cca3ed diff --git a/qtquickcontrols b/qtquickcontrols index 1c58ef02d27..f4a6a1544c4 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 1c58ef02d27023a0ee1d47a71368021bd6a6898d +Subproject commit f4a6a1544c413bd0d39c3b82a048f9d68080e390 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b6dc9d05210..1bdb56ff957 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b6dc9d05210a627a25f1ef05397e27a67c7f2f7c +Subproject commit 1bdb56ff9571dfbf4b7bd52b9d8a45ca00f4ecac diff --git a/qtremoteobjects b/qtremoteobjects index 3918dc3bb2a..fb26733bca3 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 3918dc3bb2a89f8d2eae4ca3dfab284d02011bfa +Subproject commit fb26733bca30bd1a6790db10f819f73416c827ac diff --git a/qtrepotools b/qtrepotools index a94d99a147e..14803ef10d2 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit a94d99a147e1c48125ed1a8795f969f44c75df70 +Subproject commit 14803ef10d22207bd6905eeef8861727b2d61d5e diff --git a/qtscript b/qtscript index e74e5985da8..dec80d8bf7b 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit e74e5985da8ad849116c0b99aca3a603e501c9e2 +Subproject commit dec80d8bf7b03218f7593e800f88dd3adf4617f9 diff --git a/qtscxml b/qtscxml index 53b71057390..0c753690290 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 53b71057390a31532517fead1eda1be2c503f6ef +Subproject commit 0c7536902901a882fd3e58f5314d03a37a386033 diff --git a/qtsensors b/qtsensors index 59e02539cf0..e4eb2b4c6c7 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 59e02539cf0f94bcdd0a1548a4d9234f47e09653 +Subproject commit e4eb2b4c6c7ae6a4b0221b0c152f2eab52822650 diff --git a/qtserialbus b/qtserialbus index 5cfa90e87f7..8f0fb8b7a23 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 5cfa90e87f7d6e54b16cbfcc1544e17ca944e62a +Subproject commit 8f0fb8b7a23e0b2462abfefa9c9533b5bff7c97e diff --git a/qtspeech b/qtspeech index 615ff28f6fe..b138b48ca54 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 615ff28f6fe9083b29df9ca3fa0d123817944e0c +Subproject commit b138b48ca54d0cb6abbd4437300c2237e259108f diff --git a/qtsvg b/qtsvg index 9d021799014..bc83d241c0d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 9d0217990141e793170c1b5cd5a139e6bffa14eb +Subproject commit bc83d241c0d7754cd636eef4db3cd359c35b4297 diff --git a/qttools b/qttools index 4588e08b95f..64f81759b33 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 4588e08b95f2c50dcdd9f7ab78062752afa0138b +Subproject commit 64f81759b334e70b4dc77ce66eaffe67d98aba4d diff --git a/qtwayland b/qtwayland index 9380c33a718..b7b0602d8b1 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 9380c33a718d475007d3f2955349d336267f274e +Subproject commit b7b0602d8b17aa7cf6de543a2e872c8edd6bcf18 diff --git a/qtwebchannel b/qtwebchannel index 37501a49ef9..e1487e8192c 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 37501a49ef9d61f3e6af9d08eee89ffddf9da489 +Subproject commit e1487e8192ca287f29f0f20c616aba972872b7ae diff --git a/qtwebengine b/qtwebengine index 001ef20a827..00d5008c27f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 001ef20a82749e58295a706d6b075cdcb74f1621 +Subproject commit 00d5008c27fdff1b9f3a5de15aca27fbfcbee430 diff --git a/qtwebsockets b/qtwebsockets index c5cad78cc06..90f0fc770ba 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit c5cad78cc060ddc354647123bf69036a2ef00b33 +Subproject commit 90f0fc770bad90c40fa3be03501a794401d1f414 diff --git a/qtxmlpatterns b/qtxmlpatterns index dcd7355bb9e..029368cde2b 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit dcd7355bb9ea7e7f7f788a2e00fdf5fb48ae70b3 +Subproject commit 029368cde2b9b28de95e6187b3bcabbbc87f5a8b From f5e4c7663428378b355238aebe9245fc6239eba3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 26 Aug 2020 23:46:51 +0200 Subject: [PATCH 022/106] Update submodules on '5.15' in qt/qt5 Change-Id: I45d11ab904a8cfe2ec2f18b477879f3f398da9fd Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/qt3d b/qt3d index b3ad79419b0..09eb4028e12 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b3ad79419b038b41cc7d6460131b302ba562a4fe +Subproject commit 09eb4028e1221a8aaca8b563a1dba2ae6c39b92c diff --git a/qtactiveqt b/qtactiveqt index 2535f7d0034..03d370854d3 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2535f7d0034c03500dd279e735f97941d4d051f4 +Subproject commit 03d370854d38dfc6ebdf2f9c921909f0e027ec3f diff --git a/qtbase b/qtbase index 1f3f4965f54..fb6f62354ff 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1f3f4965f54856366c065d5ff149e609066ac989 +Subproject commit fb6f62354ff8d29152db7cfa479b2689a25ae7a9 diff --git a/qtcharts b/qtcharts index e073beeb071..d759a753779 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit e073beeb0710913cd5faa0b2f570ca8383c58322 +Subproject commit d759a753779f3ae4b5ae2cb6b16401b4663618ad diff --git a/qtconnectivity b/qtconnectivity index 7a160b16dea..0dfebafe57a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 7a160b16dea1fa26b58f8b2e7c2fc6c96813bfd2 +Subproject commit 0dfebafe57adf8fbe66997ac39fac8f6746d0781 diff --git a/qtdatavis3d b/qtdatavis3d index fe5eb952c48..6cc736d3f50 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit fe5eb952c4811adfee9ef7e37463039d879774ff +Subproject commit 6cc736d3f5050eda1173525a3bef1daa6165522f diff --git a/qtdeclarative b/qtdeclarative index cc0cb02da6f..8fdc4307d30 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit cc0cb02da6fda1af6e6cd4a27d1fb8962f9ecb6e +Subproject commit 8fdc4307d303ac6588141b16530008b31c00211e diff --git a/qtdoc b/qtdoc index a43c74bc1c8..d090008ce51 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a43c74bc1c8d672f7137a7e1ca0dad687a64e73e +Subproject commit d090008ce51f995c87b7a5cd9f7cf47dda1865b3 diff --git a/qtgamepad b/qtgamepad index 4efe2111788..e2a4c660bab 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 4efe211178849a058a2d670884359043ce56c2ec +Subproject commit e2a4c660bab17dfa3b5972f8221aa27b1d771ad6 diff --git a/qtimageformats b/qtimageformats index bd735210708..e02d4e57e19 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit bd735210708a675086a6fa4533b0aea3c0c16dd4 +Subproject commit e02d4e57e19fb4b973bf736658fde82959d93ca9 diff --git a/qtlocation b/qtlocation index eed38a67e75..3e9d5379f4d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit eed38a67e759f660462e5cd233c73f07e0cfb59f +Subproject commit 3e9d5379f4db89413cb50e928857dbd852755087 diff --git a/qtmacextras b/qtmacextras index 8a8ae8fa2c8..5047b76dad3 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 8a8ae8fa2c8cfc94e06a3da0a260ffbae6c7e836 +Subproject commit 5047b76dad3078875d1aea357fbd5378f56bf340 diff --git a/qtpurchasing b/qtpurchasing index 1dc083d1aa8..5b846f7c9e8 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 1dc083d1aa85a645e933403b7bcfadf78e5d601f +Subproject commit 5b846f7c9e8dd09b924d142e5cf7753fcb082a03 diff --git a/qtqa b/qtqa index def7ffd01ce..b4888f1eae4 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit def7ffd01ce5830ba20bb876924f5118aaa92e60 +Subproject commit b4888f1eae4f3b9891b577f6603cab3de4f76f7c diff --git a/qtquick3d b/qtquick3d index 003a8efcd55..53709d98174 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 003a8efcd55777ce2e26f21d1ebd51f615cca3ed +Subproject commit 53709d98174073cb85414dccc7afa238c5dcb2e3 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1bdb56ff957..6822a725cff 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1bdb56ff9571dfbf4b7bd52b9d8a45ca00f4ecac +Subproject commit 6822a725cffd20a21475c57d7195465c59f5903b diff --git a/qtquicktimeline b/qtquicktimeline index ef794d231f7..a6022163aec 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit ef794d231f70cc0490d9f184782ab132ebeedde7 +Subproject commit a6022163aecc6bf0df02cb2ef4710fbf9f970e13 diff --git a/qtremoteobjects b/qtremoteobjects index fb26733bca3..2c5c820ef3e 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit fb26733bca30bd1a6790db10f819f73416c827ac +Subproject commit 2c5c820ef3e180b2baebaf19825970e6eb1a9662 diff --git a/qtrepotools b/qtrepotools index 14803ef10d2..9207982f370 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 14803ef10d22207bd6905eeef8861727b2d61d5e +Subproject commit 9207982f370e0bf393df2478a9b8e5e0f30882bd diff --git a/qtscript b/qtscript index dec80d8bf7b..67a58800c81 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit dec80d8bf7b03218f7593e800f88dd3adf4617f9 +Subproject commit 67a58800c81ddf51952e9ff78d1baa2a8b3227ef diff --git a/qtscxml b/qtscxml index 0c753690290..a2716305d2f 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 0c7536902901a882fd3e58f5314d03a37a386033 +Subproject commit a2716305d2f7a984666dad6f5664737963c652a1 diff --git a/qtsensors b/qtsensors index e4eb2b4c6c7..537bcd35e99 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e4eb2b4c6c7ae6a4b0221b0c152f2eab52822650 +Subproject commit 537bcd35e991880628336f8a8d397e9f3da13a20 diff --git a/qtserialbus b/qtserialbus index 8f0fb8b7a23..6ffb1885404 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 8f0fb8b7a23e0b2462abfefa9c9533b5bff7c97e +Subproject commit 6ffb1885404fb0d926874c7a648169dfbe5e1025 diff --git a/qtserialport b/qtserialport index 4d85b8ede2e..f6113252a96 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 4d85b8ede2ea521dd1a1fae7221293d57d0169be +Subproject commit f6113252a96788094825034e7faced0783b00af9 diff --git a/qtspeech b/qtspeech index b138b48ca54..49932dc1d52 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit b138b48ca54d0cb6abbd4437300c2237e259108f +Subproject commit 49932dc1d5215064bfd6da4fc80e09739667b4b1 diff --git a/qtsvg b/qtsvg index bc83d241c0d..cd30c2e9170 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit bc83d241c0d7754cd636eef4db3cd359c35b4297 +Subproject commit cd30c2e9170e4016b29ca0682d733735c8c25bb7 diff --git a/qttools b/qttools index 64f81759b33..67dd99b072f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 64f81759b334e70b4dc77ce66eaffe67d98aba4d +Subproject commit 67dd99b072fb96359f077e766067c0f218a64eba diff --git a/qtwayland b/qtwayland index b7b0602d8b1..18ab3edaf2a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b7b0602d8b17aa7cf6de543a2e872c8edd6bcf18 +Subproject commit 18ab3edaf2a4cdd1e9df6e166cf51a69a9785ecd diff --git a/qtwebchannel b/qtwebchannel index e1487e8192c..6bc9b38c599 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit e1487e8192ca287f29f0f20c616aba972872b7ae +Subproject commit 6bc9b38c599cd535191d8f434664b59b8a03de24 diff --git a/qtwebengine b/qtwebengine index 00d5008c27f..7aa99d8d5b0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 00d5008c27fdff1b9f3a5de15aca27fbfcbee430 +Subproject commit 7aa99d8d5b0dbf024019e70bf39b7d15796e1080 diff --git a/qtwebglplugin b/qtwebglplugin index 267fba6fdb2..da2b09ab2ac 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 267fba6fdb275601d2a61195ae0260f94f786cff +Subproject commit da2b09ab2ac262118e65e1668cff822d59f29116 diff --git a/qtwebview b/qtwebview index 4598b0b1a5d..0233fb69e00 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 4598b0b1a5de36007ab390ffbecd5df3d53add61 +Subproject commit 0233fb69e00d9eefc59b3748ef6b7449f37481a1 diff --git a/qtwinextras b/qtwinextras index ed12055dcc8..5f1dc16bc68 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit ed12055dcc8c089bfe88b08842d2f16dd266545c +Subproject commit 5f1dc16bc686851b45beff6f73925e05698eeb09 diff --git a/qtx11extras b/qtx11extras index 59b3f803838..c6a1ebfb151 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 59b3f8038383480b5e1c1cb31e0de0ebd6a095ba +Subproject commit c6a1ebfb151167eca65a88afc753980fa5068435 diff --git a/qtxmlpatterns b/qtxmlpatterns index 029368cde2b..6bea8f96dbb 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 029368cde2b9b28de95e6187b3bcabbbc87f5a8b +Subproject commit 6bea8f96dbbaf0935cccf9b1623b51d3264368ec From 8160e277be8808444da84148a5e803d4aecee685 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 11 Aug 2020 16:17:29 +0300 Subject: [PATCH 023/106] Provisioning: Renew iPhone signing tools MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3434 Change-Id: I53665bf4e0799da7a23ba60aff37e26052d0374a Reviewed-by: Jani Heikkinen Reviewed-by: Iikka Eklund (cherry picked from commit c1b06ec3e53943178f300071b1ee640429e1e2f5) Reviewed-by: Simo Fält Reviewed-by: Tony Sarajärvi --- .../qtci-macos-10.14-x86_64/55-signtools.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh index bded35eb4a8..85087b33869 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -114,15 +114,15 @@ sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" { Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null { iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null -iPhoneDeveloper="iosDevelopment2019CiTeam.p12" -shaIPhoneDeveloper="fa22abe1b1cc64af6585f7a61c4aba5e00220bdc" -Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper +iPhoneDeveloper="iPhoneDeveloperCiTeam2020.p12" +shaIPhoneDeveloper="73136e44fed850f398e85908e4a73f20a6bdd8a2" +Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper echo "Importing $iPhoneDeveloper.." { security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null -iPhoneDistribution="iosDistribution2019CiTeam.p12" -shaIPhoneDistribution="6510119651c7aecb21d0a1dae329f2eae1e8f4e9" -Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution +iPhoneDistribution="iPhoneDistributionCiTeam2020.p12" +shaIPhoneDistribution="36215c3cbc6bfee48e86aafbd53c56282fe36d8d" +Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution echo "Importing $iPhoneDistribution.." { security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null @@ -130,8 +130,8 @@ echo "Importing $iPhoneDistribution.." echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." mkdir "$targetFolder/Library/MobileDevice" mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles" -shaMobileprovision="477a7f3876c4333bd56a045df0d82fce795b1ebb" -Install "$cacheSigningTools/latest_ios_cert_2019/iOS_Dev_2019_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision +shaMobileprovision="ec9697276253ca7bf4401912236f0e6fde4214da" +Install "$cacheSigningTools/latest_ios_cert_2020/iOS_Dev_2020_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev_2020_citeam.mobileprovision" $shaMobileprovision # Removing password files rm -fr "$targetFolder/login_keychain_password.txt" From 33dd90348a9f4b50a61e6066304178215574c895 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 6 Aug 2020 12:33:34 +0300 Subject: [PATCH 024/106] Provisioning: Upgrade GCC version from 9.2 to 9.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3858 Change-Id: I5266162d1c144b117e3a61988f3348f2cd3d3c0a Reviewed-by: Heikki Halmet Reviewed-by: Lars Knoll Reviewed-by: Jani Heikkinen (cherry picked from commit 163c23f97ccfc23a68b8980e6663a5a5da15301c) Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/gcc.sh | 11 ++++++----- .../qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/common/linux/gcc.sh b/coin/provisioning/common/linux/gcc.sh index 06fe8bf769e..deb29ea6940 100755 --- a/coin/provisioning/common/linux/gcc.sh +++ b/coin/provisioning/common/linux/gcc.sh @@ -1,8 +1,9 @@ + #!/usr/bin/env bash ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -93,10 +94,10 @@ function InstallGCC() { --slave /usr/bin/cc cc "$installPrefix/bin/gcc${suffixVersion}" \ --slave /usr/bin/c++ c++ "$installPrefix/bin/g++${suffixVersion}" else - sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc${suffixVersion}" "$priority" - sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++${suffixVersion}" "$priority" - sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc${suffixVersion}" "$priority" - sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++${suffixVersion}" "$priority" + sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-${suffixVersion}" "$priority" + sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++-${suffixVersion}" "$priority" + sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc-${suffixVersion}" "$priority" + sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-${suffixVersion}" "$priority" fi echo "/usr/local/lib64" | sudo tee /etc/ld.so.conf.d/gcc-libraries.conf diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh index 6c6a90c85b9..573b30a928f 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh @@ -5,4 +5,4 @@ set -ex # shellcheck source=../common/linux/gcc.sh source "${BASH_SOURCE%/*}/../common/linux/gcc.sh" -InstallGCC 9.2.0 50 2b3873263d4d6b09b37102078d80dcd7016b9392 44975966b15bca922ba64efa8ec3257726a79153 +InstallGCC 9.3.0 50 526bc0ed135e65366080350d0f991157752223c0 b746688bf045a316fc92c3528138ad10d0822b6b From 6f86671359d8d80424d56eeaa8b150d362384690 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 30 Aug 2020 23:46:31 +0200 Subject: [PATCH 025/106] Update submodules on '5.15' in qt/qt5 Change-Id: I19c41cb4ace59485790a183b484d34cc955d1c94 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtqa | 2 +- qtsvg | 2 +- qtwayland | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 09eb4028e12..aa13ce25a39 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 09eb4028e1221a8aaca8b563a1dba2ae6c39b92c +Subproject commit aa13ce25a399f49d226a285e33506edda34d310b diff --git a/qtandroidextras b/qtandroidextras index 32b7e00d6da..1c4b63418fe 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 32b7e00d6da531dabc231af17c70e3bc06f823e3 +Subproject commit 1c4b63418fe3657fcb213a7f03bc2605ee0f2386 diff --git a/qtbase b/qtbase index fb6f62354ff..b3cd725f639 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fb6f62354ff8d29152db7cfa479b2689a25ae7a9 +Subproject commit b3cd725f639255d181f1c4fc191cfa747b27c286 diff --git a/qtdeclarative b/qtdeclarative index 8fdc4307d30..fce721c9224 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8fdc4307d303ac6588141b16530008b31c00211e +Subproject commit fce721c9224ad83898a2ddf8c4aa40b795dc6f77 diff --git a/qtdoc b/qtdoc index d090008ce51..6ab3f6199bd 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d090008ce51f995c87b7a5cd9f7cf47dda1865b3 +Subproject commit 6ab3f6199bd74726143efa0db4a697d7d9fda460 diff --git a/qtimageformats b/qtimageformats index e02d4e57e19..d4e82a2936f 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit e02d4e57e19fb4b973bf736658fde82959d93ca9 +Subproject commit d4e82a2936f412fadbfefa240baeed6efd310a62 diff --git a/qtqa b/qtqa index b4888f1eae4..e623157fa9e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit b4888f1eae4f3b9891b577f6603cab3de4f76f7c +Subproject commit e623157fa9e2e187de190b8dd710148c778d7ca1 diff --git a/qtsvg b/qtsvg index cd30c2e9170..73430f7a039 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit cd30c2e9170e4016b29ca0682d733735c8c25bb7 +Subproject commit 73430f7a0393d6d148946ed4b1d2795af3374d9b diff --git a/qtwayland b/qtwayland index 18ab3edaf2a..b1564c87e3f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 18ab3edaf2a4cdd1e9df6e166cf51a69a9785ecd +Subproject commit b1564c87e3fd1271575122c6b932c5e9324f07a7 From a1358676d30afca4e056f9eceeac15e46df11c4b Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 24 Jun 2020 08:59:40 +0300 Subject: [PATCH 026/106] Provisioning: Update Windows 10 x86_64 to version 2004 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MSVC 2019 version 16.6.2 MSVC 2019 Build Tools version 16.6.2 Virtio driver Virtio Balloon driver NetKVM driver Task-number: QTQAINFRA-3818 Task-number: QTQAINFRA-3817 Change-Id: Id0edee66d4eb42730a70495dbb063a0d379f026c Reviewed-by: Toni Saario Reviewed-by: Qt CI Bot (cherry picked from commit ba4eb4929eee3f613962ddd719ae337ccc6ef729) Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.yaml | 12 ++++---- coin/platform_configs/flashing-wizard.yaml | 4 +-- coin/platform_configs/qdb.yaml | 4 +-- coin/platform_configs/qt5.yaml | 20 ++++++------- coin/platform_configs/qtbase.yaml | 2 +- coin/platform_configs/qtconnectivity.yaml | 2 +- coin/platform_configs/qtsaferenderer.yaml | 4 +-- coin/platform_configs/tqtc-qt-config-gui.yaml | 4 +-- .../README_MANUAL_INSTALLATIONS | 30 +++++++++++-------- .../disable-update-orchestrator.ps1 | 1 - .../msvc2015_update.ps1 | 3 +- .../qtci-windows-10-x86_64/msvc2019.txt | 17 ++++++----- .../qtci-windows-10-x86_64/virtio.txt | 27 +++++++++++++++++ 13 files changed, 83 insertions(+), 47 deletions(-) create mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index eb7bfd456bc..d9d0aea2c77 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,7 +1,7 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Compiler: 'MSVC2015' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib' @@ -11,32 +11,32 @@ Configurations: Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Target arch: 'x86' Compiler: 'MSVC2019' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qt-zlib' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Compiler: 'MSVC2015' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Target os: 'WinRT_10' Target arch: 'x86' Compiler: 'MSVC2015' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Target os: 'WinRT_10' Target arch: 'armv7' Compiler: 'MSVC2015' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Compiler: 'MSVC2019' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib' diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index eff6e9f6377..17e808785a0 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -2,12 +2,12 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Compiler: 'MSVC2019' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Compiler: 'MSVC2019' Target arch: 'x86' Features: ['Packaging'] diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml index 544a1b905ba..c5bc7538ca5 100644 --- a/coin/platform_configs/qdb.yaml +++ b/coin/platform_configs/qdb.yaml @@ -2,13 +2,13 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Compiler: 'MSVC2015' Target arch: 'x86' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86%' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Compiler: 'MSVC2015' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64%' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index e467497fe95..2e511149d9f 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -1,13 +1,13 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Target os: 'WinRT_10' Compiler: 'MSVC2015' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Target os: 'WinRT_10' Target arch: 'x86' Compiler: 'MSVC2019' @@ -20,26 +20,26 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Target os: 'WinRT_10' Target arch: 'armv7' Compiler: 'MSVC2019' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-arm-msvc2019' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Target os: 'WinRT_10' Compiler: 'MSVC2019' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-x64-msvc2019' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Target os: 'Android_ANY' Target arch: 'multi' Compiler: 'Mingw' @@ -63,7 +63,7 @@ Configurations: Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Target os: 'QNX_700' Target arch: 'armv7' Compiler: 'Mingw' @@ -71,7 +71,7 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Target os: 'QNX_700' Target arch: 'armv8' Compiler: 'Mingw' @@ -79,7 +79,7 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Target os: 'QNX_700' Target arch: 'x86_64' Compiler: 'Mingw' @@ -101,7 +101,7 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Target os: 'WebAssembly' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index a520e6ca061..5cdca1c0ae3 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -13,7 +13,7 @@ Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Target os: 'WinRT_10' Target arch: 'x86_64' Compiler: 'MSVC2015' diff --git a/coin/platform_configs/qtconnectivity.yaml b/coin/platform_configs/qtconnectivity.yaml index 6c232f2a3de..f0b33ee445c 100644 --- a/coin/platform_configs/qtconnectivity.yaml +++ b/coin/platform_configs/qtconnectivity.yaml @@ -1,5 +1,5 @@ - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Target os: 'WinRT_10' Target arch: 'x86_64' Compiler: 'MSVC2015' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 246925fbc36..f92b3ba25fc 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -1,12 +1,12 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Features: ['Packaging', 'DisableTests'] diff --git a/coin/platform_configs/tqtc-qt-config-gui.yaml b/coin/platform_configs/tqtc-qt-config-gui.yaml index ad35fc2c82c..6c5d1d435ae 100644 --- a/coin/platform_configs/tqtc-qt-config-gui.yaml +++ b/coin/platform_configs/tqtc-qt-config-gui.yaml @@ -2,12 +2,12 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Compiler: 'MSVC2019' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' - - Template: 'qtci-windows-10-x86_64-17' + Template: 'qtci-windows-10-x86_64-51' Compiler: 'MSVC2019' Target arch: 'x86' Features: ['Packaging'] diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS index fd646cbf80f..ac6027631fd 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS @@ -10,12 +10,13 @@ Video Card - total memory: 32MB VM Options: Boot options/Firmware: BIOS -Language: English US -Keyboard: finnish +Language to install: English UK +Time and currency format: English UK +Keyboard or input method: United Kingdom location: finnish Windows 10 Enterprise Region: Finland -Keyboard layout: Finnish +Keyboard layout: United Kingdom * VMware tools (complete) installed * Resolution set to 1280x800 @@ -27,24 +28,29 @@ Keyboard layout: Finnish - Enabling autologin - Automatic login - Disabling windows updates -* Windows Defender Antivirus turned off: Open 'gpedit.msc': 'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Windows Defender Antivirus' - - Edit 'Turn off Windows Defender Antivirus' > 'Enabled' > 'Apply' +* Microsoft Defender Antivirus turned off: Open 'gpedit.msc': 'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Microsoft Defender Antivirus' + - Edit 'Turn off Microsoft Defender Antivirus' > 'Enabled' > 'Apply' - NOTE! Without this step windows defender can't be disabled! * Remote connections allowed: - Enable Remote Desktop -* Background defrag disabled: 'defragment and optimize drives' - 'change settings' - unchecked "run on a schedule" +* Background defrag disabled: 'Defragment And Optimize Drives' - 'change settings' - unchecked "run on a schedule" - Run in terminal: 'schtasks /Delete /TN "Microsoft\Windows\Defrag\ScheduledDefrag"' -* Time zone: Coordinated Universal Time +* Time zone: 'Co-ordinated Universal Time' * Windows search disabled: 'Control Panel\System and Security\Administrative Tools\Services' - 'Windows search' - stop & disable * Sysmain disabled: 'Control Panel\System and Security\Administrative Tools\Services' - 'SysMain' - stop & disable -* Power saver disabled: Open 'Power & sleep' and set 'Screen' to 'never' +* Power saver disabled: Open 'Power & sleep settings' + - set 'Screen' to 'never' + - set 'Sleep' to 'never' * Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support +* (Restart Windows) * Google Chrome installed for RTA -* Turn off Virus & threat protection (all sections) manually - - Real-tiem protection -> off +* Virus & threat protection settings: + - Real-time protection -> off - Cloud-delivered protection -> off - Automatic sample submission -> off - Tamper protection -> off +* Virus & threat protection notifications: + - Get informational notifications -> off + - Account protection notifications -> off * Activate Windows -* Modify 'Windows Software Development Kit - Windows 10.0.18362.1' from 'Add or remove programs' - - Add feature 'Debugging Tools for Windows' + diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1 index c7f23470200..1022c79814d 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-update-orchestrator.ps1 @@ -5,7 +5,6 @@ $path = "C:\Windows\System32\Tasks\Microsoft\Windows\$name" takeown /F $path /A /R icacls $path /grant Administrators:F /T -SCHTASKS /Change /TN "Microsoft\Windows\$name\Reboot" /DISABLE del "$path\Schedule Scan" del "$path\Schedule Scan Static Task" del "$path\UpdateModelTask" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 index 69f3e27be67..9ac8196e0ce 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 @@ -34,10 +34,11 @@ # Visual Studio $version was installed manually using $installer. $version = "2015 update 3" $version_number ="14.0.25420.1" -$installer = "http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978" +$installer = "en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978.exe" # default plus following components were selected: # * Visual C++ +# - Common Tools for Visual C++ 2015 # * Universal Windows App Development Tools # - Tools (1.4.1) and Windows SDK (10.0.14393) # - Windows 10 SDK (10.0.10586) diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt index 28f63762071..e5fc9e93610 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt @@ -2,13 +2,13 @@ $version = "2019" # Current version was manually upgraded from the installer -$version_number = "16.4.4" +$version_number = "16.6.2" $installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe" MSVC 2019 build tools (default installation, no additional selections). * Install after MSVC2019 is installed! * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe" - * Version: 16.4.4 + * Version: 16.6.2 Installed MSVC-2019 Components: @@ -38,14 +38,14 @@ Text Template Transformation C# and Visual Basic Roslyn compilers C++ 2019 Redistributable Update C++ Cmake tools for Windows -C++/CLI support for v142 build tools /14.24) +C++/CLI support for v142 build tools /14.26) MSBuild MSVC v142 - VS 2019 C++ ARM build tools (v14.20) -MSVC v142 - VS 2019 C++ ARM build tools (v14.24) +MSVC v142 - VS 2019 C++ ARM build tools (v14.26) MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20) -MSVC v142 - VS 2019 C++ ARM64 build tools (v14.24) +MSVC v142 - VS 2019 C++ ARM64 build tools (v14.26) MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20) -MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.24) +MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.26) .NET profiling tools C++ profiling tools JavaScript diagnostics @@ -57,11 +57,14 @@ Razor Language Services Graphics debugger and GPU profiler for DirectX Image and 3D model editors C++ ATL for latest v142 build tools (x86 & x64) -TypeScript 3.7 SDK +TypeScript 3.8 SDK Windows 10 SDK (10.0.16299.0) Windows 10 SDK (10.0.17134.0) Windows 10 SDK (10.0.17763.0) Windows 10 SDK (10.0.18362.0) +Windows 10 SDK (10.0.19041.0) # NOTE! Work loads were added during installation! +* Modify 'Windows Software Development Kit - Windows 10.0.18362.1' from 'Add or remove programs' + - Add feature 'Debugging Tools for Windows' diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt new file mode 100644 index 00000000000..4692e4a3c59 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt @@ -0,0 +1,27 @@ +Install virtio + +Our vanilla images are pre-installed in VMware where we have networking available. In KVM we can +use the VMware installed vmxnet3 NIC to fetch VirtIO drivers, install them, and only then switch +to using the VirtIO NIC in KVM. + +* Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win-0.1.171.iso +* Mount virtio-win-0.1.171.iso by double clicking it. +* Right click 'E:\NetKVM\w10\amd64\netkvm.inf' and select Install +* Right click 'E:\Balloon\w10\amd64\balloon.inf' and select Install + +* Right click 'E:\vioscsi\w10\amd64\vioscsi.inf' and select Install + +Because vioscsi does not install the entries in windows registry before we actually +have a VirtIO device installed, and we can't boot with a VirtIO device before +the driver is installed, we have to blindly install the registry entries: + +* Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg + +However, we've seen that the Owner in the registry can be wrong. This entry +sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has +to be corrected so that it will boot from the VirtIO driver. This was found out +by having 2 devices installed simultaneously and having the drivers install +properly into the registry. + +* Eject the mounting +* Remove downloaded virtio-win-0.1.171.iso From 090fbc691f6add063646e8fd979862a970000449 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 5 Sep 2020 23:46:26 +0200 Subject: [PATCH 027/106] Update submodules on '5.15' in qt/qt5 Change-Id: Ia094dff2bce9392a6b6cd8e1786927f3fdede694 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtmultimedia | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/qt3d b/qt3d index aa13ce25a39..8470b781f0c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit aa13ce25a399f49d226a285e33506edda34d310b +Subproject commit 8470b781f0c814435242f603ffe3394014b6bbcc diff --git a/qtandroidextras b/qtandroidextras index 1c4b63418fe..0bfbd231c26 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 1c4b63418fe3657fcb213a7f03bc2605ee0f2386 +Subproject commit 0bfbd231c26253a6cc7d42eef63f6f31327c14a9 diff --git a/qtbase b/qtbase index b3cd725f639..9459abbe957 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b3cd725f639255d181f1c4fc191cfa747b27c286 +Subproject commit 9459abbe957ec1d083cebf24e90ebd19a1726d09 diff --git a/qtdeclarative b/qtdeclarative index fce721c9224..ee295affc62 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fce721c9224ad83898a2ddf8c4aa40b795dc6f77 +Subproject commit ee295affc6210cb71a242f7e119e7a4f95b75fc3 diff --git a/qtdoc b/qtdoc index 6ab3f6199bd..b452310a136 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 6ab3f6199bd74726143efa0db4a697d7d9fda460 +Subproject commit b452310a1366f3422d6a7cf98d3b85562218759a diff --git a/qtgraphicaleffects b/qtgraphicaleffects index c1d206d0c30..ac1dac7099c 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit c1d206d0c30925c2bee248e2c5a33b22abf72a94 +Subproject commit ac1dac7099c9552a60da3240134ddbd8bc4fe048 diff --git a/qtmultimedia b/qtmultimedia index a0202e658be..6d70c875615 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a0202e658becd9a07a93574c4f13cf43c21325fd +Subproject commit 6d70c875615ffc9c315e203530aac0d320185701 diff --git a/qtquick3d b/qtquick3d index 53709d98174..efceeabc5c2 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 53709d98174073cb85414dccc7afa238c5dcb2e3 +Subproject commit efceeabc5c25b7a0cf67f7f48e4a078c17084b6f diff --git a/qtquickcontrols b/qtquickcontrols index f4a6a1544c4..e82f39989e8 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit f4a6a1544c413bd0d39c3b82a048f9d68080e390 +Subproject commit e82f39989e80dc541b6ad2bfa2ff6ca4679d1bf1 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6822a725cff..1740afc0795 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6822a725cffd20a21475c57d7195465c59f5903b +Subproject commit 1740afc07950fb0ae3aca0aad2534191805ff672 diff --git a/qtscxml b/qtscxml index a2716305d2f..b76df052735 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit a2716305d2f7a984666dad6f5664737963c652a1 +Subproject commit b76df0527354329a9541c1d68dfa23948b3397f9 diff --git a/qtsvg b/qtsvg index 73430f7a039..e3c639e706e 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 73430f7a0393d6d148946ed4b1d2795af3374d9b +Subproject commit e3c639e706e6511a2f8511c33f4d265f0717070c diff --git a/qttools b/qttools index 67dd99b072f..2d557b1c5c4 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 67dd99b072fb96359f077e766067c0f218a64eba +Subproject commit 2d557b1c5c4d2da8d307519835a0b97287891a9c diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 99008fa890e..e90249aa7c0 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 99008fa890eab8738fb6676f5df0101ae4467f4a +Subproject commit e90249aa7c024b100e80e68d669cc2bce1cf02c2 diff --git a/qtwayland b/qtwayland index b1564c87e3f..bd48b6b3414 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b1564c87e3fd1271575122c6b932c5e9324f07a7 +Subproject commit bd48b6b341482720652dd02866690f937e25619d diff --git a/qtwebengine b/qtwebengine index 7aa99d8d5b0..9bd422add06 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7aa99d8d5b0dbf024019e70bf39b7d15796e1080 +Subproject commit 9bd422add06df6d384eff4e4480ccda2fd27d60a diff --git a/qtwebsockets b/qtwebsockets index 90f0fc770ba..55e06385d52 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 90f0fc770bad90c40fa3be03501a794401d1f414 +Subproject commit 55e06385d520c96b0342a5007c6889d936c82845 From ff8d920caf6969ff26f15ae88efcd13c6ae9c947 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 20 Aug 2020 10:41:49 +0200 Subject: [PATCH 028/106] Remove deprecated configure argument from CI configs The -no-qpa-platform-guard configure argument is deprecated and has no effect. Change-Id: I132ccdf036c52baf54cf0c789fa063cc0455ce09 Reviewed-by: Alexandru Croitor (cherry picked from commit a42797851e7461565e50abb977ffd2f1282b61c4) Reviewed-by: Cristian Adam --- coin/platform_configs/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index d9d0aea2c77..2a690178ca9 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -108,7 +108,7 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' From 784af12d4cd14cc9ec2e8a27ff52a7880091e574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Fri, 7 Aug 2020 14:06:50 +0300 Subject: [PATCH 029/106] Provisioning: update Squish to 6.6.1 based on Qt5.15.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add Squish for Web installation, update Squish license. Pick-to:5.15 Change-Id: Id418830e82718afc20ac7390400342a6b0401a64 Reviewed-by: Heikki Halmet (cherry picked from commit 91c267a67758db507d412861b6feedc763ad23e7) Reviewed-by: Tony Sarajärvi --- .../provisioning/common/unix/squishInstall.sh | 29 ++++++++++--------- .../common/windows/squishInstall.ps1 | 10 +++---- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 7592814ba3c..bce685491d4 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -41,18 +41,19 @@ set -ex # This script will fetch and extract pre-buildt squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.5.2" -qtBranch="514x" +version="6.6.1" +qtBranch="515x" installFolder="/opt" squishFolder="$installFolder/squish" preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable" -licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/.squish-3-license" +licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$qtBranch/.squish-3-license" +licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a" if uname -a |grep -q Darwin; then compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz" - sha1="91a1d7228dc4b4bd64f93191c33d2642abc97e14" + sha1="9fff9a7cb037214d21f47f2cc53747885fd1f2ae" else compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" - sha1="63f33de55770e2588dd9f482546900e33d20f8ec" + sha1="3a50052caafa3ca583b7edf754227999d7185ffa" fi mountFolder="/tmp/squish" @@ -95,11 +96,11 @@ sudo mv "$installFolder/rta_squish_$version" "$squishFolder" if uname -a |grep -q "Ubuntu"; then if [ ! -e "/usr/lib/tcl8.6" ]; then sudo mkdir /usr/lib/tcl8.6 - sudo cp "$squishFolder/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ + sudo cp "$squishFolder/squish_for_qt/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ fi fi -DownloadURL "$licenseUrl" "$licenseUrl" "3c6b2b3ca047f68e20f697afcc3a9d376f01b376" "$HOME/.squish-3-license" +DownloadURL "$licenseUrl" "$licenseUrl" "$licenseSHA" "$HOME/.squish-3-license" echo "Changing ownerships" sudo chown -R qt:$usersGroup "$squishFolder" @@ -107,18 +108,18 @@ sudo chown qt:$usersGroup "$HOME/.squish-3-license" echo "Set commands for environment variables in .bashrc" if uname -a |grep -q "Ubuntu"; then - echo "export SQUISH_PATH=$squishFolder/package" >> ~/.profile - echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.profile + echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.profile + echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.profile else - echo "export SQUISH_PATH=$squishFolder/package" >> ~/.bashrc - echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.bashrc + echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.bashrc + echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.bashrc fi echo "Verifying Squish" -if "$squishFolder/package/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then - echo "Squish installation tested successfully" +if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt installation tested successfully" else - echo "Squish test failed! Package wasn't installed correctly." + echo "Squish for Qt test failed! Package wasn't installed correctly." exit 1 fi diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 8396743ea34..518de783d7a 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -36,8 +36,8 @@ # This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -$version = "6.5.2" -$qtBranch = "514x" +$version = "6.6.1" +$qtBranch = "515x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build" @@ -60,13 +60,13 @@ $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\Curren if ($OSVersion -eq "Windows 10 Enterprise") { $winVersion = "win10" if (Is64BitWinHost) { - $sha1 = "9262d3b749483094024c74986f93e9340afbdb62" + $sha1 = "17b5bec83f448877e42e5effdc7daf723d157800" } else { - $sha1 = "0763b344afa327e6c374971492021c5e923be892" + $sha1 = "1e6c1b3935e1c1bcdd28ec2511f24b8656d3ee6a" } } elseif ($OSVersion -eq "Windows 7 Enterprise") { $winVersion = "win7" - $sha1 = "01b3529459da948cfde319d60becc666da0e1c4d" + $sha1 = "ec890c16bb671ae79b093ba81e6567d2780f85a2" } $squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip" From 2700d2aca57651f29eec67479589c7e260a73cb5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 11 Sep 2020 23:46:40 +0200 Subject: [PATCH 030/106] Update submodules on '5.15' in qt/qt5 Change-Id: Ia53f99f6b57bb491047c95ebbbccf22ae4e4078e Reviewed-by: Qt Submodule Update Bot --- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 03d370854d3..415bc38612b 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 03d370854d38dfc6ebdf2f9c921909f0e027ec3f +Subproject commit 415bc38612bc4fa18af4f5921bc8e845c86374b0 diff --git a/qtbase b/qtbase index 9459abbe957..2b56244866c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9459abbe957ec1d083cebf24e90ebd19a1726d09 +Subproject commit 2b56244866c5a7c124d084e6b38b025cb1c53edc diff --git a/qtconnectivity b/qtconnectivity index 0dfebafe57a..09854eefb2a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 0dfebafe57adf8fbe66997ac39fac8f6746d0781 +Subproject commit 09854eefb2a1d37d0de6c6e41ad58345616b3169 diff --git a/qtdeclarative b/qtdeclarative index ee295affc62..791fe6e5c2d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ee295affc6210cb71a242f7e119e7a4f95b75fc3 +Subproject commit 791fe6e5c2d0ae3533c9aa10ffa91deae46929ee diff --git a/qtgraphicaleffects b/qtgraphicaleffects index ac1dac7099c..d53af701d16 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit ac1dac7099c9552a60da3240134ddbd8bc4fe048 +Subproject commit d53af701d166dac56c910319db9eac4b9aa4538d diff --git a/qtlocation b/qtlocation index 3e9d5379f4d..4fdb479bbbb 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 3e9d5379f4db89413cb50e928857dbd852755087 +Subproject commit 4fdb479bbbb946d825b7d908527651c4bf37091c diff --git a/qtmacextras b/qtmacextras index 5047b76dad3..a8bab12c033 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 5047b76dad3078875d1aea357fbd5378f56bf340 +Subproject commit a8bab12c0331b54a78deac921dacbc9f8f53a3bc diff --git a/qtmultimedia b/qtmultimedia index 6d70c875615..b34065e03e4 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6d70c875615ffc9c315e203530aac0d320185701 +Subproject commit b34065e03e467d2c2b7a04e84bbec815f595220c diff --git a/qtqa b/qtqa index e623157fa9e..fdcdb8fc291 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e623157fa9e2e187de190b8dd710148c778d7ca1 +Subproject commit fdcdb8fc2910dc2b73170a034d2db3d85d855737 diff --git a/qtquick3d b/qtquick3d index efceeabc5c2..e2ab40b3fba 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit efceeabc5c25b7a0cf67f7f48e4a078c17084b6f +Subproject commit e2ab40b3fbab53b44707f371e9e1dfa022caabad diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1740afc0795..454ca2f441a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1740afc07950fb0ae3aca0aad2534191805ff672 +Subproject commit 454ca2f441ae3d400255471a7ebe850c6779ad0e diff --git a/qtrepotools b/qtrepotools index 9207982f370..0cbc25d0235 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 9207982f370e0bf393df2478a9b8e5e0f30882bd +Subproject commit 0cbc25d0235de896a22dc1b08a6368fc3d9a643a diff --git a/qtscript b/qtscript index 67a58800c81..7679fa2e9fc 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 67a58800c81ddf51952e9ff78d1baa2a8b3227ef +Subproject commit 7679fa2e9fc1f35e4f6e683dcbbc516615bdc4af diff --git a/qtspeech b/qtspeech index 49932dc1d52..cca145e54c8 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 49932dc1d5215064bfd6da4fc80e09739667b4b1 +Subproject commit cca145e54c87469627a7c8e1de9747e2a499e30d diff --git a/qtsvg b/qtsvg index e3c639e706e..fdbe89e45c4 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit e3c639e706e6511a2f8511c33f4d265f0717070c +Subproject commit fdbe89e45c4ef075d0b47ff0d62bbe2ec85e9928 diff --git a/qttools b/qttools index 2d557b1c5c4..97f4de3866c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2d557b1c5c4d2da8d307519835a0b97287891a9c +Subproject commit 97f4de3866cbf389ebc318c5b7fa923b28ffbe53 diff --git a/qtwayland b/qtwayland index bd48b6b3414..96cfbda63a2 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit bd48b6b341482720652dd02866690f937e25619d +Subproject commit 96cfbda63a249385eef02e7996098079569a13b8 diff --git a/qtwebengine b/qtwebengine index 9bd422add06..455619d3875 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9bd422add06df6d384eff4e4480ccda2fd27d60a +Subproject commit 455619d3875e0e0e7a03734806d61c7998735cd4 From cd7d035f8a0a992c1de813dbc43f46bf41cbe77e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 15 Sep 2020 23:46:32 +0200 Subject: [PATCH 031/106] Update submodules on '5.15' in qt/qt5 Change-Id: Ie56e3f8aac83dd6f056eaeb9b0cc0709d8dcd98d Reviewed-by: Qt Submodule Update Bot --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtnetworkauth | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qttools | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 415bc38612b..792046651cf 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 415bc38612bc4fa18af4f5921bc8e845c86374b0 +Subproject commit 792046651cf904590d2e6a57253380d4b129b070 diff --git a/qtbase b/qtbase index 2b56244866c..54af4281806 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2b56244866c5a7c124d084e6b38b025cb1c53edc +Subproject commit 54af42818064e041859aa690a30a88c9b0729d7a diff --git a/qtdeclarative b/qtdeclarative index 791fe6e5c2d..bf65961f37c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 791fe6e5c2d0ae3533c9aa10ffa91deae46929ee +Subproject commit bf65961f37c169ddfb358dcd0aef739989e4d88e diff --git a/qtdoc b/qtdoc index b452310a136..684cf652c8b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b452310a1366f3422d6a7cf98d3b85562218759a +Subproject commit 684cf652c8b0e58ec33125197cf0918091ceb097 diff --git a/qtlocation b/qtlocation index 4fdb479bbbb..64c608f72f0 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 4fdb479bbbb946d825b7d908527651c4bf37091c +Subproject commit 64c608f72f0ffe253d37eefb56b465e70465bb05 diff --git a/qtnetworkauth b/qtnetworkauth index eacb61f5b18..c4563c236dc 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit eacb61f5b180c676b53881a1fbd73339c3e5f303 +Subproject commit c4563c236dc52fbe8789773bdd546d512ac10405 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 454ca2f441a..59aaf903cc5 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 454ca2f441ae3d400255471a7ebe850c6779ad0e +Subproject commit 59aaf903cc54a7cfba00ec3859ca59292f4cbf4a diff --git a/qtrepotools b/qtrepotools index 0cbc25d0235..ee34618d9f9 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 0cbc25d0235de896a22dc1b08a6368fc3d9a643a +Subproject commit ee34618d9f94e0cb6f678140e6cd2916308531b5 diff --git a/qttools b/qttools index 97f4de3866c..0aad0fa07bf 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 97f4de3866cbf389ebc318c5b7fa923b28ffbe53 +Subproject commit 0aad0fa07bfc27c71df27ab433916166b87148b7 diff --git a/qtwebengine b/qtwebengine index 455619d3875..c0934835a21 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 455619d3875e0e0e7a03734806d61c7998735cd4 +Subproject commit c0934835a210a1ad367d3642f28d7b19e9d89285 From 97af11bfa5ce69b9cd13935d868cf823898b01a4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 20 Sep 2020 23:45:44 +0200 Subject: [PATCH 032/106] Update submodules on '5.15' in qt/qt5 Change-Id: Ia3a992b81c73fc9287576c253e2a92e615e67e90 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 8470b781f0c..22a594d4656 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8470b781f0c814435242f603ffe3394014b6bbcc +Subproject commit 22a594d46567d3589605d5fee3a31faa8dc10438 diff --git a/qtbase b/qtbase index 54af4281806..7f9d4a8ae8f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 54af42818064e041859aa690a30a88c9b0729d7a +Subproject commit 7f9d4a8ae8fcb3a69b0d6b58f8c357c7b1bb2aa1 diff --git a/qtdeclarative b/qtdeclarative index bf65961f37c..9db0ede4c95 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bf65961f37c169ddfb358dcd0aef739989e4d88e +Subproject commit 9db0ede4c953c92eb0547c2acb04d6e87ba60ac1 diff --git a/qtdoc b/qtdoc index 684cf652c8b..7e47a90ba78 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 684cf652c8b0e58ec33125197cf0918091ceb097 +Subproject commit 7e47a90ba78972c1d85eed28563206ca0f34a40b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 59aaf903cc5..1e8d3ffa5fb 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 59aaf903cc54a7cfba00ec3859ca59292f4cbf4a +Subproject commit 1e8d3ffa5fb95699d18af5639ffeb90054b71856 diff --git a/qttools b/qttools index 0aad0fa07bf..5cd1c07e5d8 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0aad0fa07bfc27c71df27ab433916166b87148b7 +Subproject commit 5cd1c07e5d88c3c8521c1af45d47b519d6e1faba diff --git a/qtwebengine b/qtwebengine index c0934835a21..cf47a78cff6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c0934835a210a1ad367d3642f28d7b19e9d89285 +Subproject commit cf47a78cff65e7616b8458c1519ac90113a6586c From 27d187eb3259842d506bb8e35691aa4748f99025 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 14 Sep 2020 11:43:35 +0300 Subject: [PATCH 033/106] Provisioning: Update Conan packages * Update libjpeg-turbo to 2.0.5 * Replace MinGW 7 packages with MinGW 8 * Remove zlib packages as Qt is consistently built with -qt-zlib now Task-bumber: QTQAINFRA-3916 Change-Id: Ie15bbb0f0f5b3a4c1a5d08f2341e9eb16a80cce7 Reviewed-by: Heikki Halmet (cherry picked from commit c79904c463842937f6b2cc959454d2f59943a08e) Reviewed-by: Konstantin Tokarev --- .../conanmanifest.txt | 90 +++++++++---------- .../conanmanifest.txt | 90 +++++++++---------- .../conanmanifest.txt | 12 --- .../conanmanifest.txt | 12 --- .../conanmanifest.txt | 12 --- .../conanmanifest.txt | 12 --- .../conanmanifest.txt | 12 --- .../conanmanifest.txt | 12 --- .../conanmanifest.txt | 12 --- .../conanmanifest.txt | 12 --- .../qtproject/stable/export/conanmanifest.txt | 4 +- .../conanmanifest.txt | 12 +++ .../conanmanifest.txt | 12 +++ .../conanmanifest.txt | 12 +++ .../conanmanifest.txt | 12 +++ .../conanmanifest.txt | 12 +++ .../conanmanifest.txt | 12 +++ .../conanmanifest.txt | 12 +++ .../conanmanifest.txt | 12 +++ .../conanmanifest.txt | 16 ++-- .../conanmanifest.txt | 16 ++-- .../qtproject/stable/export/conanmanifest.txt | 6 +- .../conanmanifest.txt | 26 +++--- .../conanmanifest.txt | 26 +++--- .../qtproject/stable/export/conanmanifest.txt | 7 -- .../conanmanifest.txt | 9 -- .../conanfiles/qtwebkit.txt | 2 +- .../qtci-windows-10-x86_64/11-conan.ps1 | 8 +- .../conanfiles/qtwebkit.txt | 2 +- .../qtci-windows-7-x86/11-conan.ps1 | 4 +- .../conanfiles/qtwebkit.txt | 5 +- 31 files changed, 242 insertions(+), 261 deletions(-) rename coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/{e493e4ecb2fa207a4d212307e7d30a35fc0dde29 => 5a523494e1f78e9c3900ce2f09380672c297a203}/conanmanifest.txt (84%) rename coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/{1fab1e9a646ef41ee7e947ef7a9524b08e3ef34d => 5df173d8cb73784907692ca167e7d2e8316b10c7}/conanmanifest.txt (84%) delete mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/2b3cb3bb931646fe98ad49632435cdd3ed213435/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/8f06876bcdec0570dded47fecf362dd95832bd6e/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt rename coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/{2.0.3 => 2.0.5}/qtproject/stable/export/conanmanifest.txt (65%) create mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/1655126cc73fa38b3abf5795b2008935595969ae/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/793aa46df280f94646f5e993f5e3553e18ec8ae9/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt create mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt rename coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/{22d88c0e3f63872fe31c5fa40fc8085250867c11 => 1955c51c7e0a6365c20c2d798832186de95c0213}/conanmanifest.txt (90%) rename coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/{260f4ea2f609c699c16e114aec312888ec0a10b0 => 852e73d42d44dff3fe4b6ed5d6a4546250ec180e}/conanmanifest.txt (90%) rename coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/{ae932df57acef9c094443d5579df1a9b72790e1a => 7e451536519482997336e237346b93d95b87eb32}/conanmanifest.txt (93%) rename coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/{b06e2211adc32e230f2d9e729d1dcad2648782e8 => d4099b870b7e1ab748c13f5751cb2d32f893a78f}/conanmanifest.txt (93%) delete mode 100644 coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt diff --git a/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/e493e4ecb2fa207a4d212307e7d30a35fc0dde29/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/5a523494e1f78e9c3900ce2f09380672c297a203/conanmanifest.txt similarity index 84% rename from coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/e493e4ecb2fa207a4d212307e7d30a35fc0dde29/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/5a523494e1f78e9c3900ce2f09380672c297a203/conanmanifest.txt index b8dd8f9770d..2640cf1ebfc 100644 --- a/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/e493e4ecb2fa207a4d212307e7d30a35fc0dde29/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/5a523494e1f78e9c3900ce2f09380672c297a203/conanmanifest.txt @@ -1,33 +1,33 @@ -1582256998 -bin/derb.exe: db2e978367ccf635ff7ecc7d1514778e -bin/escapesrc.exe: 647ffe2234275d13cffef8b84f052700 -bin/genbrk.exe: fceaae69a437fdcd4ed1f79bdeac6f13 -bin/genccode.exe: 81e45377e293edabeb321ba3ab339abb -bin/gencfu.exe: 78036b67e099cc312da25d80f9c8b6cf -bin/gencmn.exe: 4f73ec63d48e3935e0fa67313a7d8f8f -bin/gencnval.exe: 38519687874be469d38e8aadc74d5dc7 -bin/gendict.exe: be263dfa3e3267340bb4a8815bd4f72e -bin/gennorm2.exe: 8e51f5820ec15ed33edb293d5d154138 -bin/genrb.exe: 0a911668227dec1fca18e7299d737d59 -bin/gensprep.exe: a96ab9a47ea6e80869c2f732d66296e6 -bin/icu-config: 4d315b6fa7b53efaf8974aaceb0c7a18 -bin/icudt.dll: a8b8ce26bbfb30b99d97a5ced4d016ed -bin/icudt65.dll: d134d26eb54ba7d5b637c16c974737fb -bin/icuin.dll: 5bb19d323881787da00a706f86b7a77a -bin/icuin65.dll: 5bb19d323881787da00a706f86b7a77a -bin/icuinfo.exe: d9e0c244e7a939c48c2fa2536ea3c836 -bin/icuio.dll: 98c919ca7fc813e8dc5f645fcc914e5b -bin/icuio65.dll: 98c919ca7fc813e8dc5f645fcc914e5b -bin/icupkg.exe: 5b9542ec3f054880d2ec484516fae931 -bin/icutest.dll: e94878f59e7de6f7b2cc52476540c578 -bin/icutest65.dll: e94878f59e7de6f7b2cc52476540c578 -bin/icutu.dll: 22d3955eeabe583ef8f339d43ee32e3f -bin/icutu65.dll: 22d3955eeabe583ef8f339d43ee32e3f -bin/icuuc.dll: 7871b100e82744b16a608d01df837485 -bin/icuuc65.dll: 7871b100e82744b16a608d01df837485 -bin/makeconv.exe: 3fae3578534581895353052e4268c8e8 -bin/pkgdata.exe: 3a91ebe880d28e02b72b69bef2508337 -conaninfo.txt: 81e378c465132a1385850c1d3d4394ed +1599824441 +bin/derb.exe: bdf63b2f5b550979a89e67cffc8825dc +bin/escapesrc.exe: 137b889673457a447f351f5e874eac3d +bin/genbrk.exe: bb3294c7064cb973f2ca07ee553f0420 +bin/genccode.exe: 820b92ed20fb38886dea4447f12911af +bin/gencfu.exe: aa4365ba9562fa1bbc4416fbbac63fb2 +bin/gencmn.exe: 178c5b5cff63d0e0fe9b47a4a0afb5a2 +bin/gencnval.exe: 71a8bdcb6532c752fb4e106fa602c200 +bin/gendict.exe: 420fcd1d350c9ed1ef451c8e77f023dc +bin/gennorm2.exe: 85cd1fa266ff3a0455760b12a9689fc1 +bin/genrb.exe: 480231b78483ccb146b6815a811efac3 +bin/gensprep.exe: 0abbaf32db163eab36b6fdb6930c1532 +bin/icu-config: 524e7418a34b9f37fa3d720538887dcf +bin/icudt.dll: 56532bd6f97572f1ff2f5c269c200cfa +bin/icudt65.dll: 09337a242c43e958c75c630e76f58626 +bin/icuin.dll: ccf458a6762ea1248b633f260f60570b +bin/icuin65.dll: ccf458a6762ea1248b633f260f60570b +bin/icuinfo.exe: 4274c1a2507c370533ce1151533d5e20 +bin/icuio.dll: 5c92afa27046b497ea879c5bf4d10577 +bin/icuio65.dll: 5c92afa27046b497ea879c5bf4d10577 +bin/icupkg.exe: d679b1024f2e26c1f8a1b77e7258e98f +bin/icutest.dll: 562c79d8df0fc5048f4546917b2738f2 +bin/icutest65.dll: 562c79d8df0fc5048f4546917b2738f2 +bin/icutu.dll: e45504e5c6ccde54658a7df8bd88108d +bin/icutu65.dll: e45504e5c6ccde54658a7df8bd88108d +bin/icuuc.dll: d8e8d4d51a9fd6a9849fa4ca5812f0bb +bin/icuuc65.dll: d8e8d4d51a9fd6a9849fa4ca5812f0bb +bin/makeconv.exe: 6b4805b126655a2b95428b10cf08b25f +bin/pkgdata.exe: 6455bddfee736917790fcad7d326f8c1 +conaninfo.txt: 411145de18abdd9c818ab023e965129b include/unicode/alphaindex.h: 1be039746e3da3f7baa9421062373468 include/unicode/appendable.h: 48b3a0a4c3044ad5f2af18f1ab48c8ff include/unicode/basictz.h: 57fe3c53d6b1a2bf5d1f40ec51efd7a1 @@ -215,21 +215,21 @@ include/unicode/utypes.h: 47eb8ff3f909dafa9bee14f8bb224342 include/unicode/uvernum.h: a91a8e07c665891ed234de3a58302663 include/unicode/uversion.h: 0b8f75f3d1c816ee3359dde5be390d17 include/unicode/vtzone.h: 615f12cb0d05441d0872aa677db80a90 -lib/icu/65.1/Makefile.inc: dfca695719fce3f4802048877b7e5ef5 -lib/icu/65.1/pkgdata.inc: 8a01d365fe1a225f3168d4659ea48705 -lib/icu/Makefile.inc: dfca695719fce3f4802048877b7e5ef5 -lib/icu/current/Makefile.inc: dfca695719fce3f4802048877b7e5ef5 -lib/icu/current/pkgdata.inc: 8a01d365fe1a225f3168d4659ea48705 -lib/icu/pkgdata.inc: 8a01d365fe1a225f3168d4659ea48705 -lib/libicudt.dll.a: 4297604f481c4f41cd69f1c0d41544a8 -lib/libicuin.dll.a: 78136e54cf3ad942dddc32b3d8c42aab -lib/libicuio.dll.a: 681e068e1ebbb2665b222bd3894c8f96 -lib/libicutest.dll.a: 2d7d50cebf7a15c2bd05995ff9dc2e38 -lib/libicutu.dll.a: e08a3d12905cb703179a11e250fe4f61 -lib/libicuuc.dll.a: e92fdef67e56c164ec5c6d47ae97be6b -lib/pkgconfig/icu-i18n.pc: eed957ffe006f4fb042981c0f7e0451a -lib/pkgconfig/icu-io.pc: 43c8fc7b90303c819b1669ca99e10dde -lib/pkgconfig/icu-uc.pc: 3e8708649f2ea8ebd74f0c75655bdd66 +lib/icu/65.1/Makefile.inc: 82a9c670eb96bb7e73a660f769fb3503 +lib/icu/65.1/pkgdata.inc: 2d256010da2bbf625c500da0c9826d93 +lib/icu/Makefile.inc: 82a9c670eb96bb7e73a660f769fb3503 +lib/icu/current/Makefile.inc: 82a9c670eb96bb7e73a660f769fb3503 +lib/icu/current/pkgdata.inc: 2d256010da2bbf625c500da0c9826d93 +lib/icu/pkgdata.inc: 2d256010da2bbf625c500da0c9826d93 +lib/libicudt.dll.a: 2c21378a274a52b0cfc497029e57fc32 +lib/libicuin.dll.a: 36ed05dc4117699bf26d988dedab065e +lib/libicuio.dll.a: 194a2f912ad715fa5a5ff70186c2809e +lib/libicutest.dll.a: ff4d7834bd6190801772795c206fb9bf +lib/libicutu.dll.a: d3e8cae651dddd4da2f960fdbde04c1f +lib/libicuuc.dll.a: b371571253da468a123ad696382d9bef +lib/pkgconfig/icu-i18n.pc: 7f34faeff3f9ad63e1ffd6526897f8d9 +lib/pkgconfig/icu-io.pc: 50afb654ad3f618eef1052195687b7cb +lib/pkgconfig/icu-uc.pc: 2bc7002eccc3f2c53a1270cdc04a30d6 licenses/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d share/icu/65.1/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d share/icu/65.1/config/mh-mingw: 95446b7c74bc210a824c787c9bd47a93 diff --git a/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/1fab1e9a646ef41ee7e947ef7a9524b08e3ef34d/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/5df173d8cb73784907692ca167e7d2e8316b10c7/conanmanifest.txt similarity index 84% rename from coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/1fab1e9a646ef41ee7e947ef7a9524b08e3ef34d/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/5df173d8cb73784907692ca167e7d2e8316b10c7/conanmanifest.txt index afff694ddba..04612903891 100644 --- a/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/1fab1e9a646ef41ee7e947ef7a9524b08e3ef34d/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/icu/65.1/qtproject/stable/package/5df173d8cb73784907692ca167e7d2e8316b10c7/conanmanifest.txt @@ -1,33 +1,33 @@ -1582257415 -bin/derb.exe: 430c27da15e7c5d4c6eb60e0b1e6fb8f -bin/escapesrc.exe: 9a59fded291dd4ea4cbfe3b7a1c80080 -bin/genbrk.exe: 56897185781522cd685e4af4ca102a3b -bin/genccode.exe: c99c94069e8a0098bc4db9914a7f6e7a -bin/gencfu.exe: e23c79026bb78c1991c7f7a8425fad13 -bin/gencmn.exe: 8fba64b78d2ab6f5bcd6c723da1f57ad -bin/gencnval.exe: 14c87059b1c39a72879837cabb3eb84d -bin/gendict.exe: 1380f639d83e4d1f21b55ba2495d4a41 -bin/gennorm2.exe: 914fa6268d94fe08969d7104dc55218f -bin/genrb.exe: 22e6461a351f1bf391d181f78a6ef54b -bin/gensprep.exe: 4bccca6db929a0b19fff1c5a37873b16 -bin/icu-config: 9250dfdf7faa8c4d08dfa6cf4f40e2d1 -bin/icudt.dll: 8a2d4864a89ed94a0e16eaab44d3a4c2 -bin/icudt65.dll: aa62d2fd6b59bd61116910583e3dd41d -bin/icuin.dll: 05cc7ab8708577d53395eb242a0dcc6d -bin/icuin65.dll: 05cc7ab8708577d53395eb242a0dcc6d -bin/icuinfo.exe: 3700aeeae9229fff4fe501ae415b5c36 -bin/icuio.dll: f2c286ef97baf5ddc7c8110dbd9e6b4c -bin/icuio65.dll: f2c286ef97baf5ddc7c8110dbd9e6b4c -bin/icupkg.exe: c03f0c24917039bc98a3b7616c9b141e -bin/icutest.dll: 9db214eb296a087b0385f07c21e15b6f -bin/icutest65.dll: 9db214eb296a087b0385f07c21e15b6f -bin/icutu.dll: f8df0b65efc4fffc30850b6fd6513eeb -bin/icutu65.dll: f8df0b65efc4fffc30850b6fd6513eeb -bin/icuuc.dll: 81bebc9772571cf4c591512707de7f6f -bin/icuuc65.dll: 81bebc9772571cf4c591512707de7f6f -bin/makeconv.exe: ef7aa77bd42300c98ea2676e095356d0 -bin/pkgdata.exe: 4f957c0e9d26523d6977c47879ccb20a -conaninfo.txt: 87f571b59f21d0be18bbbb1a53c6b2f2 +1599824772 +bin/derb.exe: 68f722afeee75e9e4ea733789eba324d +bin/escapesrc.exe: 5ad48603ddefa7d75f9589db693311a0 +bin/genbrk.exe: cb5487bd37da74c470576d584803a0fd +bin/genccode.exe: 80d139a2b22c5c6a7c2ae6801cd8a3ee +bin/gencfu.exe: a9f417b50cd8237299100d349d78758e +bin/gencmn.exe: cf1a794d018ea5a93db501c4a17d0945 +bin/gencnval.exe: 2f9cf00a1c6d6ff40f6cc1d2420f2ac9 +bin/gendict.exe: bda284e8eb469caad6ff4320060bd63d +bin/gennorm2.exe: 643cc388bf9f49a1c22274070237e4b5 +bin/genrb.exe: 900294bcf2ba376e8a53dd0681efba84 +bin/gensprep.exe: f04c5265bb68e10eb86bbe812348a18a +bin/icu-config: 7ff0a51957bda1eec9b2ea457e7bacab +bin/icudt.dll: 1e1a6b8fbf1093c1b4fab982c4b62c39 +bin/icudt65.dll: 91e49d019e10d91cccada5b136f68dec +bin/icuin.dll: a67701e7309fae5371c5f656f0deabea +bin/icuin65.dll: a67701e7309fae5371c5f656f0deabea +bin/icuinfo.exe: 7fd856803068da1b6d736f88d5578444 +bin/icuio.dll: e53d31b6899dbcec1eb77da207c8e1cc +bin/icuio65.dll: e53d31b6899dbcec1eb77da207c8e1cc +bin/icupkg.exe: 26c99ac9bf0aef675b6be3d0e4ec1f96 +bin/icutest.dll: 29acd15f69048c04adc7350ea2f7422a +bin/icutest65.dll: 29acd15f69048c04adc7350ea2f7422a +bin/icutu.dll: 4b0c32dd74735e9cd2421026fd5a26d9 +bin/icutu65.dll: 4b0c32dd74735e9cd2421026fd5a26d9 +bin/icuuc.dll: ff8cfb1cb4360f103f0ab37a21b0f565 +bin/icuuc65.dll: ff8cfb1cb4360f103f0ab37a21b0f565 +bin/makeconv.exe: 2f22caee13d695a9c596aa97eb581cf7 +bin/pkgdata.exe: 49ebcb66931fd627061de5683646d511 +conaninfo.txt: c04d7a669f242e429c8cd6c4c9f9b250 include/unicode/alphaindex.h: 1be039746e3da3f7baa9421062373468 include/unicode/appendable.h: 48b3a0a4c3044ad5f2af18f1ab48c8ff include/unicode/basictz.h: 57fe3c53d6b1a2bf5d1f40ec51efd7a1 @@ -215,21 +215,21 @@ include/unicode/utypes.h: 47eb8ff3f909dafa9bee14f8bb224342 include/unicode/uvernum.h: a91a8e07c665891ed234de3a58302663 include/unicode/uversion.h: 0b8f75f3d1c816ee3359dde5be390d17 include/unicode/vtzone.h: 615f12cb0d05441d0872aa677db80a90 -lib/icu/65.1/Makefile.inc: 578a604f57dc0000c3e4272ac5159ced -lib/icu/65.1/pkgdata.inc: 9f94a807fa04d65b45bb04114c74fc8f -lib/icu/Makefile.inc: 578a604f57dc0000c3e4272ac5159ced -lib/icu/current/Makefile.inc: 578a604f57dc0000c3e4272ac5159ced -lib/icu/current/pkgdata.inc: 9f94a807fa04d65b45bb04114c74fc8f -lib/icu/pkgdata.inc: 9f94a807fa04d65b45bb04114c74fc8f -lib/libicudt.dll.a: 6d19c78195cbf2af4f68b3a1ff93f612 -lib/libicuin.dll.a: dc5b0188be79d786a1612ab4fe8ee105 -lib/libicuio.dll.a: a995de8310f252cd356949a19ace1fc9 -lib/libicutest.dll.a: 4017504bf0e1cbc71fa05c5fda30fcc8 -lib/libicutu.dll.a: aca996f2762328e3a3125c52582d4c19 -lib/libicuuc.dll.a: 45c324a2b53e0860672f73a13dd0eaed -lib/pkgconfig/icu-i18n.pc: b86403e2cbd81f2559f01cda101d5181 -lib/pkgconfig/icu-io.pc: f7bf176168b2c48bbf9d5b3ab3513420 -lib/pkgconfig/icu-uc.pc: b939d24910a7545f0dd199b79e60a1a0 +lib/icu/65.1/Makefile.inc: ae4b3c0b2dcf1a107c37da529a5a572d +lib/icu/65.1/pkgdata.inc: 392ec5b38e95048f06b739125b748364 +lib/icu/Makefile.inc: ae4b3c0b2dcf1a107c37da529a5a572d +lib/icu/current/Makefile.inc: ae4b3c0b2dcf1a107c37da529a5a572d +lib/icu/current/pkgdata.inc: 392ec5b38e95048f06b739125b748364 +lib/icu/pkgdata.inc: 392ec5b38e95048f06b739125b748364 +lib/libicudt.dll.a: 42327b89226e435dee32d4ed4043dd1e +lib/libicuin.dll.a: a479b7dfc0f69346644676625cab1154 +lib/libicuio.dll.a: 1b048a7fcae8905fa929b9ef282d05c8 +lib/libicutest.dll.a: af3d4912fe492f3089589416a582bff3 +lib/libicutu.dll.a: d27299ee9de0bfa2f7130b177a101ced +lib/libicuuc.dll.a: 0f98b361c734d8d5cd157678c8d7d6f1 +lib/pkgconfig/icu-i18n.pc: 5a7e7ff2a321db58b97ccaa41ea54e3b +lib/pkgconfig/icu-io.pc: 426da02c84b5694772af9a5bc11dee9b +lib/pkgconfig/icu-uc.pc: 5a761b97c6c84a60887f35393d0d15c2 licenses/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d share/icu/65.1/LICENSE: 8bc5d32052a96f214cbdd1e53dfc935d share/icu/65.1/config/mh-mingw64: 071f2f1be85f81141e4243ab65ca2a5b diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt deleted file mode 100644 index 4f7d36803c8..00000000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582282172 -conaninfo.txt: d3531bf4208a49880b6916cb487ca0fd -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/jpeg-static.lib: f1380749e57edaa40366510a55c4a581 -lib/pkgconfig/libjpeg.pc: 46be85b895bb997ec57faee440b199c9 -lib/pkgconfig/libturbojpeg.pc: 891d57d67b7bb2d2246f6c84e3802ff3 -lib/turbojpeg-static.lib: 03531f3967223cb10088dccf1f0ab17e -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/2b3cb3bb931646fe98ad49632435cdd3ed213435/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/2b3cb3bb931646fe98ad49632435cdd3ed213435/conanmanifest.txt deleted file mode 100644 index 9297a30c176..00000000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/2b3cb3bb931646fe98ad49632435cdd3ed213435/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582282436 -conaninfo.txt: e412e1148672ae4437d5d9e8f0089dae -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/libjpeg.a: 9ec4a3ea70de97420d8a262641df11fe -lib/libturbojpeg.a: 3704f7242f7d79187bcf09b7ff7bb86e -lib/pkgconfig/libjpeg.pc: fa956ecec06575a626eb24df4ade7059 -lib/pkgconfig/libturbojpeg.pc: 7a28369f664feaef64c4f36043bdbf84 -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt deleted file mode 100644 index 32c864e903e..00000000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582280262 -conaninfo.txt: 3ce2f8cfe80b79b4dd725bdff24c402d -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/jpeg-static.lib: 277031e07ff0a68b0da547fd73fa8931 -lib/pkgconfig/libjpeg.pc: 18fe4739f1c264cc5807ac171f79d5de -lib/pkgconfig/libturbojpeg.pc: 080a4da3c8052f00721671016bda4f79 -lib/turbojpeg-static.lib: 142395e528dbecc678f0f0242512cb32 -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt deleted file mode 100644 index c64266b1dd9..00000000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582281085 -conaninfo.txt: 05273e3ea056a1d7946e1065622c2e6d -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/jpeg-static.lib: 94e22b458fa49d878f9f5ecaa83b4d4c -lib/pkgconfig/libjpeg.pc: f86f98cba102e1be6cdbc77e1f73d6e2 -lib/pkgconfig/libturbojpeg.pc: 9138a79005a0dd437ec485743cbc7708 -lib/turbojpeg-static.lib: 85dceca1ee42fb40b9177483a710931c -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt deleted file mode 100644 index acabe6058ae..00000000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582282050 -conaninfo.txt: 5d70fc12733b9ab4f2eef806064af4fc -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/jpeg-static.lib: dc1e769eef09dec4761fcecb6e25e416 -lib/pkgconfig/libjpeg.pc: 58e4fea9c97c1e8ddfe69f5c7a90ee63 -lib/pkgconfig/libturbojpeg.pc: d8e6f88b279ae6759cf8f0363cb08913 -lib/turbojpeg-static.lib: 34efadab9c45a4be93bb62e415b7bd5b -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/8f06876bcdec0570dded47fecf362dd95832bd6e/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/8f06876bcdec0570dded47fecf362dd95832bd6e/conanmanifest.txt deleted file mode 100644 index bf51a89e7ab..00000000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/8f06876bcdec0570dded47fecf362dd95832bd6e/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582282336 -conaninfo.txt: 99d4bfcf4fe5b33346747d9aed5a90dd -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/libjpeg.a: 520fd96afa81fffa67fbccc2d7499459 -lib/libturbojpeg.a: 65c525625f9bdb0c9c93b3cae93116f1 -lib/pkgconfig/libjpeg.pc: 9088ad9e74b2b56826bc949805312370 -lib/pkgconfig/libturbojpeg.pc: 176a550708755ea935a3928dcc75bb0c -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt deleted file mode 100644 index 4a4b33863cc..00000000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582281572 -conaninfo.txt: 9868d7ba246ae96d18441c975ee816f1 -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/jpeg-static.lib: fb149794dc225dcb890e1b2c48569660 -lib/pkgconfig/libjpeg.pc: 16468bac09adeea126c41a7e2eab161f -lib/pkgconfig/libturbojpeg.pc: 6bad484e5ee764e95e570110855d00c8 -lib/turbojpeg-static.lib: 12e129d91c4f92257c7b12d88a0ccd3b -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt deleted file mode 100644 index 53b1b8b3ea4..00000000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582280641 -conaninfo.txt: d0e67ef7124b3767bbd5cebd7e4bf806 -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/jpeg-static.lib: 50b078fedbf48e2accf55cc1201717d8 -lib/pkgconfig/libjpeg.pc: ef1839c5639ee60768584c29626db8b1 -lib/pkgconfig/libturbojpeg.pc: 53423ccf67af6cc13cc571dd1e7568e0 -lib/turbojpeg-static.lib: c3f43cb91de65238d38bee7051671eff -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/export/conanmanifest.txt similarity index 65% rename from coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/export/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/export/conanmanifest.txt index b0bb10aca1b..ad0ef6f4925 100644 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/export/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/export/conanmanifest.txt @@ -1,4 +1,4 @@ -1582280120 +1599735572 LICENSE.md: 5aa9930034582b90e2008d2c609d1317 -conanfile.py: fc9f9025d45306204140aafdf174a422 +conanfile.py: b752e9ae1c6b8d65022ecc9094a8a8ab export_source/CMakeLists.txt: eb0fcc86f467a4c6ac9f37c16887a29f diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/1655126cc73fa38b3abf5795b2008935595969ae/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/1655126cc73fa38b3abf5795b2008935595969ae/conanmanifest.txt new file mode 100644 index 00000000000..a05189eee19 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/1655126cc73fa38b3abf5795b2008935595969ae/conanmanifest.txt @@ -0,0 +1,12 @@ +1599738045 +conaninfo.txt: 4fbbb44cc5815e6399144d4738128d34 +include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae +lib/libjpeg.a: 1beb177c28bec696d92c96cb12cf50b0 +lib/libturbojpeg.a: 3601472665eebd9ba70a8b4ded622fb7 +lib/pkgconfig/libjpeg.pc: 31670f8efeaaf416c10ef75033a21f89 +lib/pkgconfig/libturbojpeg.pc: 9ec917634a8badf738794da988e0cdd2 +licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt new file mode 100644 index 00000000000..1407cc56162 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt @@ -0,0 +1,12 @@ +1599737655 +conaninfo.txt: 1dff9c35ef06cd1f8e1dd7d3fa538a0b +include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae +lib/jpeg-static.lib: 810088c13a0b62845d2a07fb9aedcf7c +lib/pkgconfig/libjpeg.pc: 42c35d08648be46cba25e5c233bb4ceb +lib/pkgconfig/libturbojpeg.pc: f5f04f23108a7e0287c36286668bed72 +lib/turbojpeg-static.lib: 57ccb316b5e241e589e4774d1873d2ea +licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt new file mode 100644 index 00000000000..71ab3ac4d3d --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt @@ -0,0 +1,12 @@ +1599735723 +conaninfo.txt: 96940ef25782fe187ad876a9798aefe6 +include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae +lib/jpeg-static.lib: bac9b04d6d20cb9e29a47c56e1d58e92 +lib/pkgconfig/libjpeg.pc: 8d98a30a9db257c005f7619aa5c0a054 +lib/pkgconfig/libturbojpeg.pc: 79a1c3fce48acb5ad45fd69fc5b5a7e0 +lib/turbojpeg-static.lib: 8e8c7d62afe07877cc07befcafc9b189 +licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt new file mode 100644 index 00000000000..75ec237bf80 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt @@ -0,0 +1,12 @@ +1599736618 +conaninfo.txt: 03f3f4e3fcf5d709d43aaec1f55898dc +include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae +lib/jpeg-static.lib: 3134bba34a47e8c27d20ec4a4588f54d +lib/pkgconfig/libjpeg.pc: e4f3f7cf063e703922623a48759eb548 +lib/pkgconfig/libturbojpeg.pc: 6412ff7d0f49e4b26ea9c17526fcd995 +lib/turbojpeg-static.lib: c01d3cddcc20514a4ed2ab9e0bf6bc79 +licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/793aa46df280f94646f5e993f5e3553e18ec8ae9/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/793aa46df280f94646f5e993f5e3553e18ec8ae9/conanmanifest.txt new file mode 100644 index 00000000000..fc756487fb8 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/793aa46df280f94646f5e993f5e3553e18ec8ae9/conanmanifest.txt @@ -0,0 +1,12 @@ +1599738143 +conaninfo.txt: 3991de728b2148a357e0adfe83ddff62 +include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae +lib/libjpeg.a: ab32855e9f71865bc026351d8e2e77dc +lib/libturbojpeg.a: a05a8eef4b34c10a68a3e5c7864f55b5 +lib/pkgconfig/libjpeg.pc: afe1d748f5b9331fe322f414eeb8d871 +lib/pkgconfig/libturbojpeg.pc: 5a19528da1aae07f73729acf72ea8d9b +licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt new file mode 100644 index 00000000000..7e02159b0f7 --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt @@ -0,0 +1,12 @@ +1599737489 +conaninfo.txt: faf97c2c98fbb660379fb96a52f3dcf3 +include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae +lib/jpeg-static.lib: 05604ba0465efd4fe4e8a518e82cdb81 +lib/pkgconfig/libjpeg.pc: 6819f3aec5d0a35187d510fb1034c584 +lib/pkgconfig/libturbojpeg.pc: 7226bc5b0d915e053a1204aba32867cf +lib/turbojpeg-static.lib: efa16bdd47f24831fc02ac0b69912490 +licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt new file mode 100644 index 00000000000..7e20c84429d --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt @@ -0,0 +1,12 @@ +1599737081 +conaninfo.txt: da8913ab37decb7846f324c2c05b6e56 +include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae +lib/jpeg-static.lib: 9d557bb3f4769b7e3820d71be4189cfb +lib/pkgconfig/libjpeg.pc: 1bcb08ffc4f83b2306ff794ad5c2b91c +lib/pkgconfig/libturbojpeg.pc: b9783de5729e5835e41a35cb2f5fa568 +lib/turbojpeg-static.lib: 09609dcfdad02bed5bf00e348fff8807 +licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt new file mode 100644 index 00000000000..14fdfebb5fe --- /dev/null +++ b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.5/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt @@ -0,0 +1,12 @@ +1599736121 +conaninfo.txt: d3b27ba63fbdcf067b5f4afd1a1fdef0 +include/jconfig.h: 364c5b940297dd331dacb42dc5bc3cb9 +include/jerror.h: 9b7898fe417de269b8be88b10df908b0 +include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d +include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb +include/turbojpeg.h: e5051d1390ea320d22e81c7e73a163ae +lib/jpeg-static.lib: bcdd30b7636c7ed8f0e6dbfb97729c31 +lib/pkgconfig/libjpeg.pc: e124d9000016d4fa108588c91087d060 +lib/pkgconfig/libturbojpeg.pc: 6b112424701322f51d06015089920210 +lib/turbojpeg-static.lib: 7d9c9ee5fb38b856bb9424a2ae5f9bbd +licenses/LICENSE.md: 26d6491346496a57f75f00a78199122e diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/22d88c0e3f63872fe31c5fa40fc8085250867c11/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/1955c51c7e0a6365c20c2d798832186de95c0213/conanmanifest.txt similarity index 90% rename from coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/22d88c0e3f63872fe31c5fa40fc8085250867c11/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/1955c51c7e0a6365c20c2d798832186de95c0213/conanmanifest.txt index 975f4f5dcf6..aba8aa878c0 100644 --- a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/22d88c0e3f63872fe31c5fa40fc8085250867c11/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/1955c51c7e0a6365c20c2d798832186de95c0213/conanmanifest.txt @@ -1,9 +1,9 @@ -1582270297 -bin/libxml2-2.dll: 47b3af0297a53e146d739ba46b957ac9 -bin/xml2-config: f002e2e4fcc1ac7a3ed6a93044a99de1 -bin/xmlcatalog.exe: f51848350034b8b6010fd11f6e3aa10f -bin/xmllint.exe: 689e7c9b94aff9b39383164b13412623 -conaninfo.txt: ea32a81840ad020d92e3c678a2b31ab7 +1599827075 +bin/libxml2-2.dll: aaf2802bcdbb62e364d33d4307c2f656 +bin/xml2-config: b0691a0a3ab1546612090cb77b4f29bb +bin/xmlcatalog.exe: ceb3b58dd442e7a174d60a400b485355 +bin/xmllint.exe: 542a2dc43a32156244634f496afdad71 +conaninfo.txt: e494fa1f215b7080df24fc4bf487250b include/libxml2/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d include/libxml2/libxml/HTMLparser.h: d57891c89573ed6dce04b8133e7438d2 include/libxml2/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f @@ -53,6 +53,6 @@ include/libxml2/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd include/libxml2/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 include/libxml2/win32config.h: e51ff5a65571584fbe45f75eede0ee3e include/libxml2/wsockcompat.h: fd8ce4d6dabe53035a28c6aa64926b1c -lib/libxml2.dll.a: 843beb5d307eda9c6600f02a2cd3f701 -lib/xml2Conf.sh: 26c219db3da9c216926f8894c096409b +lib/libxml2.dll.a: e9e9bb7eed77331a47e228a1a8f4c0c5 +lib/xml2Conf.sh: 1ac09ea07a1d73a25e8478e5911da219 licenses/COPYING: 2044417e2e5006b65a8b9067b683fcf1 diff --git a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/260f4ea2f609c699c16e114aec312888ec0a10b0/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/852e73d42d44dff3fe4b6ed5d6a4546250ec180e/conanmanifest.txt similarity index 90% rename from coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/260f4ea2f609c699c16e114aec312888ec0a10b0/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/852e73d42d44dff3fe4b6ed5d6a4546250ec180e/conanmanifest.txt index c7c8ae44027..e99d69b582e 100644 --- a/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/260f4ea2f609c699c16e114aec312888ec0a10b0/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxml2/2.9.10/qtproject/stable/package/852e73d42d44dff3fe4b6ed5d6a4546250ec180e/conanmanifest.txt @@ -1,9 +1,9 @@ -1582270098 -bin/libxml2-2.dll: 0a707dea653e54ed8606c66cb4af5eca -bin/xml2-config: f90c21a49ff66959f9370243e8aeb274 -bin/xmlcatalog.exe: 1f51631564d0df1e2eb7bab1e744797f -bin/xmllint.exe: 705805f98a8ee9045078d6d91a1e076b -conaninfo.txt: 5d6fafed34bc3f9e5dce2ad99f65aba0 +1599827195 +bin/libxml2-2.dll: dccd1b6cf7425125913b2095ff8eccc2 +bin/xml2-config: e93ed273bc16d12c4f8ecff87ceaaf79 +bin/xmlcatalog.exe: 0b575f8389ac5a8e397c3cde88babb85 +bin/xmllint.exe: 5a63ba2b6556ef0ae20436495c28355c +conaninfo.txt: 13134884f7be0e49d19552cd3423b91b include/libxml2/libxml/DOCBparser.h: 21e6523a86338325c527e1e8847adc1d include/libxml2/libxml/HTMLparser.h: d57891c89573ed6dce04b8133e7438d2 include/libxml2/libxml/HTMLtree.h: 46cf4cefb419e18c40b8d5b6ac982f3f @@ -53,6 +53,6 @@ include/libxml2/libxml/xpathInternals.h: c18fad3cce22369a75166afed6343bcd include/libxml2/libxml/xpointer.h: 5b8025430888d5b99d03d159ddc78388 include/libxml2/win32config.h: e51ff5a65571584fbe45f75eede0ee3e include/libxml2/wsockcompat.h: fd8ce4d6dabe53035a28c6aa64926b1c -lib/libxml2.dll.a: 849838d8f7d5dcbcb16097dbdabee707 -lib/xml2Conf.sh: d980a83ab1cdd3637ee4fc3aeb75733c +lib/libxml2.dll.a: 176eb6473b51dd69835b6213fcc40b19 +lib/xml2Conf.sh: 8713c5cd801bb525b6758a22a65c2a2e licenses/COPYING: 2044417e2e5006b65a8b9067b683fcf1 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/export/conanmanifest.txt index b8f7a946689..77017cfffb4 100644 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/export/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/export/conanmanifest.txt @@ -1,4 +1,4 @@ -1582270556 +1599827656 LICENSE.md: d9f691088a6aaf0589397de712404f23 -conanfile.py: fdaa2f193e25d36dbf5b92a0f6567611 -export_source/patches/0001-remove-with-profiler.patch: 44c783ce23e5be1360ef1521b1427da3 +conanfile.py: 1a377def24ec5c2878da1d9d97a2c39c +export_source/patches/Add-configuration-for-profiler.diff: 5207625dda27ca22cf49f7b136dc6585 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/ae932df57acef9c094443d5579df1a9b72790e1a/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/7e451536519482997336e237346b93d95b87eb32/conanmanifest.txt similarity index 93% rename from coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/ae932df57acef9c094443d5579df1a9b72790e1a/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/7e451536519482997336e237346b93d95b87eb32/conanmanifest.txt index a9d50c77baa..dcedf88b1e8 100644 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/ae932df57acef9c094443d5579df1a9b72790e1a/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/7e451536519482997336e237346b93d95b87eb32/conanmanifest.txt @@ -1,9 +1,9 @@ -1582271749 -bin/libexslt-0.dll: 4b9cbde76ca3933da5a551bccc952ec4 -bin/libxslt-1.dll: 819776a46fa5031884953e1ad3e0e753 -bin/xslt-config: 7425a897e93c2b35d098d21de286564b -bin/xsltproc.exe: b7198489b916c3f5936284418d756f80 -conaninfo.txt: fd798c9d2cde468877c2c25020e44443 +1599827930 +bin/libexslt-0.dll: ff772bdd16e06a28bbbbbf509dace06f +bin/libxslt-1.dll: eccc32869a72838b9a8092e40d9ee7a2 +bin/xslt-config: 438e5a0d83ce7648c0bcb64446bd2874 +bin/xsltproc.exe: 5e2fe2b2465d07b4bad0ce6a90f61702 +conaninfo.txt: c74c15f161d0366c1f8b8ae6157be410 include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 include/libexslt/exsltconfig.h: eb4297a735f2666c5872067c25f16005 include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36 @@ -24,16 +24,16 @@ include/libxslt/transform.h: ccbcce4553f3231003b1944002814246 include/libxslt/variables.h: ebd9b3b1f996c4a2ed79d4473ff0fd77 include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387 include/libxslt/xsltInternals.h: 0c245b0fcc81bf537632a45adf8fcffb -include/libxslt/xsltconfig.h: e49047ac857ae0fea24b99ee4c56de62 +include/libxslt/xsltconfig.h: b932ebe3a2edfd7b6e42c6ccab09105f include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 include/libxslt/xsltutils.h: 5f7848088182b183e6d1fdb335b2616a -lib/libexslt.dll.a: a27a9df2d4b7cf070377a32e10961027 -lib/libexslt.la: 036e99c1bab6a8d3a63471ad94d13aaf -lib/libxslt.dll.a: 5bf3583373ca584df267b766c3e9cb3e -lib/pkgconfig/libexslt.pc: a9e14aa113bd8c105df76410e046b233 -lib/pkgconfig/libxslt.pc: 12169caf9654c69c90e0e0c0f98776ad -lib/xsltConf.sh: 5fa057a4733819c38f5c55d1ce50fd48 +lib/libexslt.dll.a: 7bd46b7300a66f8ce59b2899c66544e2 +lib/libexslt.la: fa24e93ffd0896a1e4aeeb7bfbc39c0b +lib/libxslt.dll.a: ceb051c0397694811816950fc670681b +lib/pkgconfig/libexslt.pc: be5f747c35a550775cb2367bdb4a7384 +lib/pkgconfig/libxslt.pc: ebc9b2f108096aec1ddf30f4c45855ec +lib/xsltConf.sh: baa711dd9eb12d5855ef8fa782129519 licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458 share/aclocal/libxslt.m4: 7b0b8b6bd86eea30c617663c9e9439b3 share/doc/libxslt-1.1.34/html/API.html: 205e063f09d60a36b44a61c6b7af0af9 diff --git a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/b06e2211adc32e230f2d9e729d1dcad2648782e8/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/d4099b870b7e1ab748c13f5751cb2d32f893a78f/conanmanifest.txt similarity index 93% rename from coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/b06e2211adc32e230f2d9e729d1dcad2648782e8/conanmanifest.txt rename to coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/d4099b870b7e1ab748c13f5751cb2d32f893a78f/conanmanifest.txt index bd393d41601..e1a69a64576 100644 --- a/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/b06e2211adc32e230f2d9e729d1dcad2648782e8/conanmanifest.txt +++ b/coin/provisioning/common/windows/conan_manifests/libxslt/1.1.34/qtproject/stable/package/d4099b870b7e1ab748c13f5751cb2d32f893a78f/conanmanifest.txt @@ -1,9 +1,9 @@ -1582271938 -bin/libexslt-0.dll: 1561e984c203d94cdfcf78235ecfe43a -bin/libxslt-1.dll: 0174f89e8ec9e26aee9e665e686214b9 -bin/xslt-config: 6e477e88682bb878d649b48d48de3b3d -bin/xsltproc.exe: 3cd6a8754d4e21dec52c8dab720cfcf3 -conaninfo.txt: fb9e8ed7e2ab80afd38743a228fd5ac9 +1599827795 +bin/libexslt-0.dll: a3e52849942745520c13c2d20135ada7 +bin/libxslt-1.dll: e6a19c28494ef3e908d869598b79c97a +bin/xslt-config: bf300e18f495cea8591f79fdb0520d06 +bin/xsltproc.exe: 0d34ec7f2847d75a4140d5221366ae75 +conaninfo.txt: d905a86a351921bb21c973326d39e9de include/libexslt/exslt.h: f01af3bf058520059ba6d50f42133717 include/libexslt/exsltconfig.h: eb4297a735f2666c5872067c25f16005 include/libexslt/exsltexports.h: 03a75a174bc5b056f014e592cfd4db36 @@ -24,16 +24,16 @@ include/libxslt/transform.h: ccbcce4553f3231003b1944002814246 include/libxslt/variables.h: ebd9b3b1f996c4a2ed79d4473ff0fd77 include/libxslt/xslt.h: 0c08b8e7223b72f822a58457520b6387 include/libxslt/xsltInternals.h: 0c245b0fcc81bf537632a45adf8fcffb -include/libxslt/xsltconfig.h: e23457bb8ef22a6dc617d413679d59ca +include/libxslt/xsltconfig.h: 77d836d8d0a9b2fdd6bea3d379696d80 include/libxslt/xsltexports.h: 751f95448e71222d8e10d31ebf8822df include/libxslt/xsltlocale.h: d7b200e408cefe5082b15d3a5e1bf600 include/libxslt/xsltutils.h: 5f7848088182b183e6d1fdb335b2616a -lib/libexslt.dll.a: 3fee05595887faea3d7022483bf8ab9d -lib/libexslt.la: 1ea05e967d865f7ac83d66aeef3f9740 -lib/libxslt.dll.a: b42e5789521163430675d263374e745e -lib/pkgconfig/libexslt.pc: 40e4bf2205e0bcc91529683218d7b53a -lib/pkgconfig/libxslt.pc: 296b763342f742c10accc1cd9b08dd08 -lib/xsltConf.sh: dab0389225bc7e3b47e502c8a6496ff0 +lib/libexslt.dll.a: f86f6868818b72c97c977e182700d479 +lib/libexslt.la: d0c4257b491be8cf3c45d5e01b7ffb96 +lib/libxslt.dll.a: 461a9372775da06a0747728a1b505ae2 +lib/pkgconfig/libexslt.pc: ba1963709ee3ecc7323aaf188404f144 +lib/pkgconfig/libxslt.pc: 9ef33a36710bc31556d1038e27e2510d +lib/xsltConf.sh: 9b2f5a93679c6e963d8bf3d6efa46591 licenses/COPYING: 0cd9a07afbeb24026c9b03aecfeba458 share/aclocal/libxslt.m4: 7b0b8b6bd86eea30c617663c9e9439b3 share/doc/libxslt-1.1.34/html/API.html: 205e063f09d60a36b44a61c6b7af0af9 diff --git a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt deleted file mode 100644 index dc3fe965777..00000000000 --- a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/export/conanmanifest.txt +++ /dev/null @@ -1,7 +0,0 @@ -1582277614 -FindZLIB.cmake: 0ec128c2f97a3a6d7e800d3204e5c94f -LICENSE: 1ac8330e79e050867144e174d80880f7 -conanfile.py: c7aba1a732c28bb9851cb50acf3f7a4d -export_source/CMakeLists.txt: b45a8f19ed120e922c1cb720c0e4a7c7 -export_source/CMakeLists_minizip.txt: 7b2c2a9ab51d0ba37b5ca35da21579b7 -export_source/minizip.patch: dc8ffe80d334f8e5b1bb967593fe2d4a diff --git a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt deleted file mode 100644 index 239d5b824e5..00000000000 --- a/coin/provisioning/common/windows/conan_manifests/zlib/1.2.11/qtproject/stable/package/5a14faea650589a68f33a6a5b0207a4a852a5f1d/conanmanifest.txt +++ /dev/null @@ -1,9 +0,0 @@ -1582279989 -FindZLIB.cmake: 0ec128c2f97a3a6d7e800d3204e5c94f -conaninfo.txt: 40e76e93e86476bbd92e1e82b71d04bb -include/zconf.h: 931d0dd891d90ace1eab7a46125a8bda -include/zlib.h: 0338828e9d00c94645648b1517108324 -lib/libzlib.a: 7e55bbef492eceaf8101e433e2a46720 -lib/pkgconfig/zlib.pc: 29adeed07108745c3562dc19343f3d99 -licenses/LICENSE: 1af2e5353c16e930435fff550f827c3e -zlib.pc: 29adeed07108745c3562dc19343f3d99 diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt index 5def5b33daa..f670b394ffc 100644 --- a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt @@ -2,7 +2,7 @@ icu/65.1@qtproject/stable libxml2/2.9.10@qtproject/stable libxslt/1.1.34@qtproject/stable -libjpeg-turbo/2.0.3@qtproject/stable +libjpeg-turbo/2.0.5@qtproject/stable [generators] cmake diff --git a/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 index 71abc7e1d2d..09c5b21cf0f 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 @@ -50,20 +50,20 @@ Run-Conan-Install ` Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir Mingw73-x86 ` + -BuildinfoDir Mingw-x86 ` -Arch x86 ` -Compiler "gcc" ` - -CompilerVersion 7 ` + -CompilerVersion 8 ` -CompilerLibcxx "libstdc++" ` -CompilerException "dwarf2" ` -CompilerThreads "posix" Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir Mingw73-x86_64 ` + -BuildinfoDir Mingw-x86_64 ` -Arch x86_64 ` -Compiler "gcc" ` - -CompilerVersion 7 ` + -CompilerVersion 8 ` -CompilerLibcxx "libstdc++" ` -CompilerException "seh" ` -CompilerThreads "posix" diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt index 491c9375a64..eaafc008983 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt @@ -2,7 +2,7 @@ icu/65.1@qtproject/stable libxml2/2.9.10@qtproject/stable libxslt/1.1.34@qtproject/stable -libjpeg-turbo/2.0.3@qtproject/stable +libjpeg-turbo/2.0.5@qtproject/stable [generators] cmake diff --git a/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 index aa380a0919a..1d928ffaf3e 100644 --- a/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 @@ -2,10 +2,10 @@ Run-Conan-Install ` -ConanfilesDir "$PSScriptRoot\conanfiles" ` - -BuildinfoDir Mingw73-x86 ` + -BuildinfoDir Mingw-x86 ` -Arch x86 ` -Compiler "gcc" ` - -CompilerVersion 7 ` + -CompilerVersion 8 ` -CompilerLibcxx "libstdc++" ` -CompilerException "dwarf2" ` -CompilerThreads "posix" diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt index 3850cfeadde..663d5903fc8 100644 --- a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt +++ b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt @@ -2,8 +2,7 @@ icu/65.1@qtproject/stable libxml2/2.9.10@qtproject/stable libxslt/1.1.34@qtproject/stable -libjpeg-turbo/2.0.3@qtproject/stable -zlib/1.2.11@qtproject/stable +libjpeg-turbo/2.0.5@qtproject/stable [generators] cmake @@ -22,8 +21,6 @@ libxslt:shared=True libjpeg-turbo:shared=False -zlib:shared=False - [imports] bin, icudt65.dll -> ./bin bin, icuin65.dll -> ./bin From 4c82f61c3173b91a862e8a8f60560a4451d14032 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 14 Sep 2020 14:10:39 +0300 Subject: [PATCH 034/106] Provisioning: Update Conan to 1.29.0 Task-bumber: QTQAINFRA-3916 Change-Id: I52d8a0255efcc7b4b139ec5050cf3d59003f12a9 Reviewed-by: Heikki Halmet (cherry picked from commit f73fa57088ed47d555b6635d11219d57379c9e90) Reviewed-by: Konstantin Tokarev --- coin/provisioning/common/windows/conan.ps1 | 2 +- .../common/windows/conan_requirements.txt | 42 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/coin/provisioning/common/windows/conan.ps1 b/coin/provisioning/common/windows/conan.ps1 index e7e0de226a3..8b22ab1db36 100644 --- a/coin/provisioning/common/windows/conan.ps1 +++ b/coin/provisioning/common/windows/conan.ps1 @@ -37,7 +37,7 @@ $scriptsPath = "C:\Python36\Scripts" Run-Executable "$scriptsPath\pip3.exe" "install -r $PSScriptRoot\conan_requirements.txt" -Write-Output "Conan = 1.22.2" >> ~\versions.txt +Write-Output "Conan = 1.29.0" >> ~\versions.txt # Use Qt Project repository by default Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert --force" diff --git a/coin/provisioning/common/windows/conan_requirements.txt b/coin/provisioning/common/windows/conan_requirements.txt index 7097de1ecb1..078158e8dbe 100644 --- a/coin/provisioning/common/windows/conan_requirements.txt +++ b/coin/provisioning/common/windows/conan_requirements.txt @@ -1,33 +1,33 @@ -# Generated for conan==1.22.2 -appdirs==1.4.3 +# Generated for conan==1.29.0 +appdirs==1.4.4 bottle==0.12.18 -certifi==2019.11.28 +certifi==2020.6.20 chardet==3.0.4 colorama==0.4.3 -conan==1.22.2 +conan==1.29.0 deprecation==2.0.7 -distlib==0.3.0 -distro==1.1.0 +distlib==0.3.1 +distro==1.5.0 fasteners==0.15 filelock==3.0.12 future==0.18.2 -idna==2.9 -importlib-metadata==1.5.0 -Jinja2==2.11.1 +idna==2.10 +importlib-metadata==1.7.0 +Jinja2==2.11.2 MarkupSafe==1.1.1 monotonic==1.5 node-semver==0.6.1 -packaging==20.1 -patch-ng==1.17.2 -pluginbase==0.7 -Pygments==2.5.2 +packaging==20.4 +patch-ng==1.17.4 +pluginbase==1.0.0 +Pygments==2.7.0 PyJWT==1.7.1 -pyparsing==2.4.6 +pyparsing==2.4.7 python-dateutil==2.8.1 -PyYAML==5.3 -requests==2.23.0 -six==1.14.0 -tqdm==4.43.0 -urllib3==1.25.8 -virtualenv==20.0.4 -zipp==2.2.0 +PyYAML==5.3.1 +requests==2.24.0 +six==1.15.0 +tqdm==4.49.0 +urllib3==1.25.10 +virtualenv==20.0.31 +zipp==3.1.0 From fdc7292c5b4de307523eac54e9264a91d4fd4f5a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 20 Aug 2020 14:09:45 +0300 Subject: [PATCH 035/106] Provisioning: Install Java for SLES 15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Java is needed by RTA jenkins Change-Id: Ibe6c7fa211eb83b431dc3ee79ed93300796154b0 Reviewed-by: Tony Sarajärvi (cherry picked from commit 99a15a2cd4dd890b4621ae4418fd9a274b02aed5) --- .../provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh index 638a93875cf..8c596142e71 100755 --- a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh @@ -103,3 +103,5 @@ sudo zypper -nq install unixODBC-devel unixODBC # sqlite support sudo zypper -nq install sqlite3 sqlite3-devel +# Java - needed by RTA jenkins +sudo zypper -nq install java From 11cd0f1d75c2f1a79e3d1409e69b6b58cb96e44e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 15 Sep 2020 14:21:06 +0300 Subject: [PATCH 036/106] Provisioning: Disable fstrim.timer fstrim scans the filesystem and sends 'UNMAP' commands for each unused block it finds. Let's disable it so it won't cause unexpected situations. Task-number: QTQAINFRA-3919 Change-Id: I20c97441fd47728a3063ae50f87fe6347186bdbd Reviewed-by: Alexandru Croitor (cherry picked from commit 031bc19ae6278a8f12ec195f8dfa14d326efb23f) Reviewed-by: Toni Saario --- .../qtci-linux-SLES-15-x86_64/01-disable-fstrim_timer.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-fstrim_timer.sh diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-fstrim_timer.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-fstrim_timer.sh new file mode 100644 index 00000000000..9fd06e729c8 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-fstrim_timer.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +# This will disable fstrim. The fstrim.timer is scheduled to activate the fstrim.service +sudo systemctl stop fstrim.timer +sudo systemctl disable fstrim.timer From 2498be2a3b13bbbc073956b680e0c075cacb9cae Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 15 Sep 2020 14:09:40 +0300 Subject: [PATCH 037/106] Provisioning: Disable btrfs balance jobs Btrfs use lot's of CPU while running Task-number: QTQAINFRA-3919 Change-Id: I08b89b57c92d90f752dde76375711e61ed173c2c Reviewed-by: Alexandru Croitor (cherry picked from commit 51fc48896c058198cc20d83b72a2a6373be6a22f) Reviewed-by: Toni Saario --- .../01-disable-btrfs-balance.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-btrfs-balance.sh diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-btrfs-balance.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-btrfs-balance.sh new file mode 100755 index 00000000000..a0126cb2437 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-btrfs-balance.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -ex + +# Stops the balance job if one is running at the moment. This is a very expensive thing to run and causes major slow down. +sudo systemctl stop btrfs-balance.service + +# This will disable btrfs balance job scheduling. +sudo sed -i 's/BTRFS_BALANCE_PERIOD="weekly"/BTRFS_BALANCE_PERIOD="none"/g' /etc/sysconfig/btrfsmaintenance From 9e99d5738cecc05ac0f1782bb01987f7d581573a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 15 Sep 2020 13:01:14 +0300 Subject: [PATCH 038/106] Provisioning: Disable daily cron jobs from SLES 15 Task-number: QTQAINFRA-3919 Change-Id: Iabf03aeadb3f0fa7091428ef3ea6075b199d9c77 Reviewed-by: Alexandru Croitor (cherry picked from commit dd2111cf9f07599f0722559ad9ae174e16d44ac4) Reviewed-by: Toni Saario --- .../qtci-linux-SLES-15-x86_64/01-disable-cron_daily.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-cron_daily.sh diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-cron_daily.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-cron_daily.sh new file mode 100755 index 00000000000..166fb1e285f --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-disable-cron_daily.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +# this script will remove executable rights from cron.daily jobs +sudo chmod -x /etc/cron.daily/* + From 6d73ff5b719d03bda2d18acf83c77d92fadc48c3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 22 Sep 2020 23:46:08 +0200 Subject: [PATCH 039/106] Update submodules on '5.15' in qt/qt5 Change-Id: I17eb658c678892ebd884781e6994bc7552ec469c Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdoc | 2 +- qttools | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 7f9d4a8ae8f..adc42bebcac 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7f9d4a8ae8fcb3a69b0d6b58f8c357c7b1bb2aa1 +Subproject commit adc42bebcac764ca8de78578e3a4ac39b621bd09 diff --git a/qtdoc b/qtdoc index 7e47a90ba78..433c92b655a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7e47a90ba78972c1d85eed28563206ca0f34a40b +Subproject commit 433c92b655a62609e06c109ab0ecaeb73ab152d9 diff --git a/qttools b/qttools index 5cd1c07e5d8..f3180b6eb65 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 5cd1c07e5d88c3c8521c1af45d47b519d6e1faba +Subproject commit f3180b6eb650598ca937943d6cd66da13335d9de diff --git a/qtwebengine b/qtwebengine index cf47a78cff6..bb6fffd1ad3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit cf47a78cff65e7616b8458c1519ac90113a6586c +Subproject commit bb6fffd1ad3168edc9d67492cca585084d8ae6b4 From b19292f1bd145dbe691aafb8b345f02812ad682f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 27 Sep 2020 23:45:44 +0200 Subject: [PATCH 040/106] Update submodules on '5.15' in qt/qt5 Change-Id: I320620d033abe32e18a62af700cefa72c0b1bd81 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 22a594d4656..c54025b31c1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 22a594d46567d3589605d5fee3a31faa8dc10438 +Subproject commit c54025b31c1fb02d325f6e78ccfb3f40504efced diff --git a/qtbase b/qtbase index adc42bebcac..08ab62aa2e6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit adc42bebcac764ca8de78578e3a4ac39b621bd09 +Subproject commit 08ab62aa2e6e390630963303bcf0543c112c2425 diff --git a/qtdeclarative b/qtdeclarative index 9db0ede4c95..b040a00a411 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9db0ede4c953c92eb0547c2acb04d6e87ba60ac1 +Subproject commit b040a00a4110923940f3dbc02a7e305f03198e3a diff --git a/qtdoc b/qtdoc index 433c92b655a..e3333439a4e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 433c92b655a62609e06c109ab0ecaeb73ab152d9 +Subproject commit e3333439a4ebd6a765bb148d94319138610b7535 diff --git a/qtmultimedia b/qtmultimedia index b34065e03e4..67cac1524f5 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit b34065e03e467d2c2b7a04e84bbec815f595220c +Subproject commit 67cac1524f56af09289eb76b5e2a38ca6d2a78c6 diff --git a/qtqa b/qtqa index fdcdb8fc291..a8062dfe3a1 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit fdcdb8fc2910dc2b73170a034d2db3d85d855737 +Subproject commit a8062dfe3a1ccfe4f22db4fe7a64e2c339edeb1b diff --git a/qtwebengine b/qtwebengine index bb6fffd1ad3..c0a1d2b8354 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit bb6fffd1ad3168edc9d67492cca585084d8ae6b4 +Subproject commit c0a1d2b8354d213a2d43f1782533ac2716ca860f From b960dfbc7b15960b6c682907b399ba38f729c835 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 24 Sep 2020 16:34:08 +0200 Subject: [PATCH 041/106] Change license of top-level configure, configure.bat The license should be GPLv3-EXCEPT, like for the same file in qtbase. Change-Id: I59c63c0a693394dc9f8de4706c2e113fe2ea4130 Reviewed-by: Paul Wicking Reviewed-by: Lars Knoll (cherry picked from commit 0f7c2c37395cad5a6692123d270be9df2e5be189) Reviewed-by: Qt Cherry-pick Bot --- LICENSE.GPL3-EXCEPT | 704 ++++++++++++++++++++++++++++++++++++++++++++ configure | 27 +- configure.bat | 27 +- 3 files changed, 726 insertions(+), 32 deletions(-) create mode 100644 LICENSE.GPL3-EXCEPT diff --git a/LICENSE.GPL3-EXCEPT b/LICENSE.GPL3-EXCEPT new file mode 100644 index 00000000000..b1cb1bec78a --- /dev/null +++ b/LICENSE.GPL3-EXCEPT @@ -0,0 +1,704 @@ +This is the GNU General Public License version 3, annotated with The +Qt Company GPL Exception 1.0: + +------------------------------------------------------------------------- + +The Qt Company GPL Exception 1.0 + +Exception 1: + +As a special exception you may create a larger work which contains the +output of this application and distribute that work under terms of your +choice, so long as the work is not otherwise derived from or based on +this application and so long as the work does not in itself generate +output that contains the output from this application in its original +or modified form. + +Exception 2: + +As a special exception, you have permission to combine this application +with Plugins licensed under the terms of your choice, to produce an +executable, and to copy and distribute the resulting executable under +the terms of your choice. However, the executable must be accompanied +by a prominent notice offering all users of the executable the entire +source code to this application, excluding the source code of the +independent modules, but including any changes you have made to this +application, under the terms of this license. + + +------------------------------------------------------------------------- + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/configure b/configure index b6954b85621..89b394299a4 100755 --- a/configure +++ b/configure @@ -1,32 +1,27 @@ #! /bin/sh ############################################################################# ## -## Copyright (C) 2015 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the build tools of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:LGPL21$ +## $QT_BEGIN_LICENSE:GPL-EXCEPT$ ## Commercial License Usage ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the ## Software or, alternatively, in accordance with the terms contained in ## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. ## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3 as published by the Free Software +## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-3.0.html. ## ## $QT_END_LICENSE$ ## diff --git a/configure.bat b/configure.bat index a9f81cb7995..500d627fdea 100644 --- a/configure.bat +++ b/configure.bat @@ -1,32 +1,27 @@ @echo off ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: -:: Copyright (C) 2015 The Qt Company Ltd. +:: Copyright (C) 2020 The Qt Company Ltd. :: Contact: http://www.qt.io/licensing/ :: :: This file is part of the tools applications of the Qt Toolkit. :: -:: $QT_BEGIN_LICENSE:LGPL21$ +:: $QT_BEGIN_LICENSE:GPL-EXCEPT$ :: Commercial License Usage :: Licensees holding valid commercial Qt licenses may use this file in :: accordance with the commercial license agreement provided with the :: Software or, alternatively, in accordance with the terms contained in :: a written agreement between you and The Qt Company. For licensing terms -:: and conditions see http://www.qt.io/terms-conditions. For further -:: information use the contact form at http://www.qt.io/contact-us. +:: and conditions see https://www.qt.io/terms-conditions. For further +:: information use the contact form at https://www.qt.io/contact-us. :: -:: GNU Lesser General Public License Usage -:: Alternatively, this file may be used under the terms of the GNU Lesser -:: General Public License version 2.1 or version 3 as published by the Free -:: Software Foundation and appearing in the file LICENSE.LGPLv21 and -:: LICENSE.LGPLv3 included in the packaging of this file. Please review the -:: following information to ensure the GNU Lesser General Public License -:: requirements will be met: https://www.gnu.org/licenses/lgpl.html and -:: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -:: -:: As a special exception, The Qt Company gives you certain additional -:: rights. These rights are described in The Qt Company LGPL Exception -:: version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +:: GNU General Public License Usage +:: Alternatively, this file may be used under the terms of the GNU +:: General Public License version 3 as published by the Free Software +:: Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +:: included in the packaging of this file. Please review the following +:: information to ensure the GNU General Public License requirements will +:: be met: https://www.gnu.org/licenses/gpl-3.0.html. :: :: $QT_END_LICENSE$ :: From 1ba3cf2fc7c3e5c37821fdaba5dc4215126807b6 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 22 Sep 2020 08:59:12 +0300 Subject: [PATCH 042/106] Provisioning: Install MCUXpresso MCUXpresso IDE provides the tools for flashing and onboard debugging Task-number: UL-3091 Change-Id: I05224af4ae7528f219f1b682ecd14bd0e331e3bf Reviewed-by: Milla Pohjanheimo Reviewed-by: Jukka Jokiniva (cherry picked from commit 08c253a6252b30c3ed48c918bae406e7411aa064) --- .../common/windows/install-mcuxpresso.ps1 | 46 +++++++++++++++++++ .../90-install-mcuxpresso.ps1 | 1 + 2 files changed, 47 insertions(+) create mode 100755 coin/provisioning/common/windows/install-mcuxpresso.ps1 create mode 100755 coin/provisioning/qtci-windows-10-x86_64/90-install-mcuxpresso.ps1 diff --git a/coin/provisioning/common/windows/install-mcuxpresso.ps1 b/coin/provisioning/common/windows/install-mcuxpresso.ps1 new file mode 100755 index 00000000000..08647fad60a --- /dev/null +++ b/coin/provisioning/common/windows/install-mcuxpresso.ps1 @@ -0,0 +1,46 @@ +############################################################################ +## +## Copyright (C) 2020 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +# This script installs NXP MCUXpresso IDE +# MCUXpresso IDE provides the tools for flashing and onboard debugging + +$version = "11.2.0_4120" +$url = "http://ci-files01-hki.intra.qt.io/input/windows/MCUXpressoIDE_$version.zip" +$zip = "C:\Windows\Temp\MCUXpressoIDE_$version.zip" + +Download $url $url $zip +Extract-7Zip $zip C: +Rename-Item C:\MCUXpressoIDE_$version C:\MCUXpressoIDE +Write-Output "MCUXpresso IDE = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-mcuxpresso.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-mcuxpresso.ps1 new file mode 100755 index 00000000000..22d19322c6a --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-mcuxpresso.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-mcuxpresso.ps1" From 4c0af96f21995cef22a59c0cda5a1ff8f6ba07ec Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 24 Sep 2020 09:58:35 +0300 Subject: [PATCH 043/106] Provisioning: Install STM32CubeProgrammer This will install STM32CubeProgrammer to Windows 10 needed by MCU RTA Task-number: UL-3091 Change-Id: I97f7df33af9bf4c56849c1cf3c93b3a413ba6f44 Reviewed-by: Milla Pohjanheimo Reviewed-by: Iikka Eklund (cherry picked from commit 2076163c5e6978df28257f590730fbcc83a8ad2a) Reviewed-by: Jukka Jokiniva --- .../windows/install-stm32cubeprogrammer.ps1 | 50 +++++++++++++++++++ .../90-install-stm32cubeprogrammer.ps1 | 1 + 2 files changed, 51 insertions(+) create mode 100644 coin/provisioning/common/windows/install-stm32cubeprogrammer.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/90-install-stm32cubeprogrammer.ps1 diff --git a/coin/provisioning/common/windows/install-stm32cubeprogrammer.ps1 b/coin/provisioning/common/windows/install-stm32cubeprogrammer.ps1 new file mode 100644 index 00000000000..a5eba038381 --- /dev/null +++ b/coin/provisioning/common/windows/install-stm32cubeprogrammer.ps1 @@ -0,0 +1,50 @@ +############################################################################ +## +## Copyright (C) 2020 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +# This script will install STM32CubeProgrammer software needed by MCU RTA +# Official donwload from https://www.st.com/en/development-tools/stm32cubeprog.html + +$version ="2_5_0" +$url = "http://ci-files01-hki.ci.local/input/windows/STMicroelectronics_v$%7Bversion%7D.zip" +$zip = "C:\Windows\Temp\STMicroelectronics_v${version}.zip" + +Download $url $url $zip +Extract-7Zip $zip "C:\Program Files" +Remove-Item -Recurse -Force -Path $zip + +Write-Output "STM32CubeProgrammer = $version" >> ~/versions.txt + + + diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-stm32cubeprogrammer.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-stm32cubeprogrammer.ps1 new file mode 100644 index 00000000000..25c2bb4229a --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-stm32cubeprogrammer.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-stm32cubeprogrammer.ps1" From 7ccb74551da1aa5eb262c268bc0a08412502bac2 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 3 Sep 2020 12:31:45 +0300 Subject: [PATCH 044/106] Provisioning: Retry python installation if failure occurs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Python installation is flaky and we haven't be able to determine the root cause for it. Re-running the installation might help. (Might) because we can't reproduce this manually. Task-number: QTQAINFRA-3875 Change-Id: Id46d250a02e01007f03dfbb886d75b23c23a6216 Reviewed-by: Toni Saario (cherry picked from commit 6e3cb240df720ecf33d59d0087ee3cdf0fe0353f) Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/python.ps1 | 28 ++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/windows/python.ps1 b/coin/provisioning/common/windows/python.ps1 index 342358d5dab..ab094ffaf06 100644 --- a/coin/provisioning/common/windows/python.ps1 +++ b/coin/provisioning/common/windows/python.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -54,8 +54,30 @@ $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$versio Write-Host "Fetching from URL..." Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 -Write-Host "Installing $package..." -Run-Executable "msiexec" "/passive /i $package TARGETDIR=$targetDir ALLUSERS=1" + +# Python installation is flaky, but seems to pass with second run if error occurs. +$stop = $false +[int]$retry = "0" +do { + try { + # /levx = e:'All error messages' v:'Verbose' x:'Extra debugging info' + Run-Executable "msiexec" "/passive /i $package /levx C:\Windows\Temp\Python_log.log TARGETDIR=$targetDir ALLUSERS=1" + $stop = $true + } + catch { + Get-Content C:\Windows\Temp\Python_log.log -Tail 50 + if ($retry -gt 2) { + Write-Host "Python installation failed!" + throw + } + else { + Write-Host "Couldn't install python, retrying in 30 seconds" + Start-Sleep -s 30 + $retry = $retry + 1 + } + } +} +while ($stop -ne $true) # We need to change allowZip64 from 'False' to 'True' to be able to create ZIP files that use the ZIP64 extensions when the zipfile is larger than 2 GB Write-Host "Changing allowZip64 value to 'True'..." From c4b34771c1aa42515480a310153eb4e009b82169 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 3 Oct 2020 23:46:06 +0200 Subject: [PATCH 045/106] Update submodules on '5.15' in qt/qt5 Change-Id: Ica4575f85b5ca75a033bc5c4641f719f328ea756 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/qt3d b/qt3d index c54025b31c1..2b34df423c1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c54025b31c1fb02d325f6e78ccfb3f40504efced +Subproject commit 2b34df423c1f2d525e341ad11cd2f281d1caf0c6 diff --git a/qtactiveqt b/qtactiveqt index 792046651cf..7d5b1ca45ea 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 792046651cf904590d2e6a57253380d4b129b070 +Subproject commit 7d5b1ca45eaa49388ef5dc1b61aff4c6fc741997 diff --git a/qtandroidextras b/qtandroidextras index 0bfbd231c26..28eea59d45c 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 0bfbd231c26253a6cc7d42eef63f6f31327c14a9 +Subproject commit 28eea59d45c7f381caaf3da18ae040b7e4bd55a7 diff --git a/qtbase b/qtbase index 08ab62aa2e6..344f60269f3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 08ab62aa2e6e390630963303bcf0543c112c2425 +Subproject commit 344f60269f3eada0c2c0fffadb7909268215aebc diff --git a/qtcharts b/qtcharts index d759a753779..1a25abd33bf 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit d759a753779f3ae4b5ae2cb6b16401b4663618ad +Subproject commit 1a25abd33bf65bae6434c7a7fdd747929ffe2d36 diff --git a/qtconnectivity b/qtconnectivity index 09854eefb2a..8e624270b7a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 09854eefb2a1d37d0de6c6e41ad58345616b3169 +Subproject commit 8e624270b7af41fe29844a7971c41c98cd251ec6 diff --git a/qtdatavis3d b/qtdatavis3d index 6cc736d3f50..a3e04c4fd28 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 6cc736d3f5050eda1173525a3bef1daa6165522f +Subproject commit a3e04c4fd28e5df09454c17ad5d48211610e73e9 diff --git a/qtdeclarative b/qtdeclarative index b040a00a411..95f8cd5632d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b040a00a4110923940f3dbc02a7e305f03198e3a +Subproject commit 95f8cd5632dcb72ec4fa7910099f210ce5f22078 diff --git a/qtdoc b/qtdoc index e3333439a4e..2e169757807 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e3333439a4ebd6a765bb148d94319138610b7535 +Subproject commit 2e1697578072216795d1a3642c7bfbcb0a381fbc diff --git a/qtgamepad b/qtgamepad index e2a4c660bab..e92a0864e8a 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit e2a4c660bab17dfa3b5972f8221aa27b1d771ad6 +Subproject commit e92a0864e8aa434f201c12269c66dd5ba373242e diff --git a/qtgraphicaleffects b/qtgraphicaleffects index d53af701d16..a3b37bffa40 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit d53af701d166dac56c910319db9eac4b9aa4538d +Subproject commit a3b37bffa4083eda2666f369cacdee69371b27d3 diff --git a/qtimageformats b/qtimageformats index d4e82a2936f..93ae5523192 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d4e82a2936f412fadbfefa240baeed6efd310a62 +Subproject commit 93ae5523192b6d636a32986d9cae10294bca5a83 diff --git a/qtlocation b/qtlocation index 64c608f72f0..9ac778b23aa 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 64c608f72f0ffe253d37eefb56b465e70465bb05 +Subproject commit 9ac778b23aa77c62470efcd6bb3afe57576c0aa7 diff --git a/qtlottie b/qtlottie index 2245b587f16..b182dcd78a3 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 2245b587f162f8d7a152049832739af9700e7c2d +Subproject commit b182dcd78a35b4667b2568857b7719d555c7fddb diff --git a/qtmacextras b/qtmacextras index a8bab12c033..7fa49a1c639 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit a8bab12c0331b54a78deac921dacbc9f8f53a3bc +Subproject commit 7fa49a1c639e6174f25ed570bea0f3cd261c2fc9 diff --git a/qtmultimedia b/qtmultimedia index 67cac1524f5..4b26133b1ca 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 67cac1524f56af09289eb76b5e2a38ca6d2a78c6 +Subproject commit 4b26133b1cac084a61dbbf68b3fff711ca49f712 diff --git a/qtnetworkauth b/qtnetworkauth index c4563c236dc..304005c1288 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit c4563c236dc52fbe8789773bdd546d512ac10405 +Subproject commit 304005c1288e8b76138285e051ea51b88d44273a diff --git a/qtpurchasing b/qtpurchasing index 5b846f7c9e8..55c9b8325da 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 5b846f7c9e8dd09b924d142e5cf7753fcb082a03 +Subproject commit 55c9b8325daf15eb5654e8834de6b8fe41ca7f6e diff --git a/qtqa b/qtqa index a8062dfe3a1..8afa17c2f67 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit a8062dfe3a1ccfe4f22db4fe7a64e2c339edeb1b +Subproject commit 8afa17c2f6782ac165cbaff05961bbcef4273aa9 diff --git a/qtquick3d b/qtquick3d index e2ab40b3fba..6722290ac00 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit e2ab40b3fbab53b44707f371e9e1dfa022caabad +Subproject commit 6722290ac002f7a5c13261215d836947cae52684 diff --git a/qtquickcontrols b/qtquickcontrols index e82f39989e8..f20d5ba29e9 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit e82f39989e80dc541b6ad2bfa2ff6ca4679d1bf1 +Subproject commit f20d5ba29e97b96c9aba39649b853a736986582a diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1e8d3ffa5fb..b6280dd2077 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1e8d3ffa5fb95699d18af5639ffeb90054b71856 +Subproject commit b6280dd207746f32092f5cb2b55b8c5f8ffa44b9 diff --git a/qtquicktimeline b/qtquicktimeline index a6022163aec..725369606ac 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit a6022163aecc6bf0df02cb2ef4710fbf9f970e13 +Subproject commit 725369606acc67783c2b6121a15b6b0b566e9e96 diff --git a/qtremoteobjects b/qtremoteobjects index 2c5c820ef3e..220fcba0cb8 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 2c5c820ef3e180b2baebaf19825970e6eb1a9662 +Subproject commit 220fcba0cb8e59ab99236ed4e94395852b1e49d2 diff --git a/qtscript b/qtscript index 7679fa2e9fc..00bfde6155e 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 7679fa2e9fc1f35e4f6e683dcbbc516615bdc4af +Subproject commit 00bfde6155e2afb9f4881886e51067363d903cf3 diff --git a/qtscxml b/qtscxml index b76df052735..a34700697ed 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit b76df0527354329a9541c1d68dfa23948b3397f9 +Subproject commit a34700697ed9a46786c8b56356dc19cc871be920 diff --git a/qtsensors b/qtsensors index 537bcd35e99..f230ae749d9 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 537bcd35e991880628336f8a8d397e9f3da13a20 +Subproject commit f230ae749d91bede85a27918bce3c88897ca713f diff --git a/qtserialbus b/qtserialbus index 6ffb1885404..a69e258f030 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 6ffb1885404fb0d926874c7a648169dfbe5e1025 +Subproject commit a69e258f0307833dc75deef930021fc8413e4d9d diff --git a/qtserialport b/qtserialport index f6113252a96..3fa1e369324 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f6113252a96788094825034e7faced0783b00af9 +Subproject commit 3fa1e3693249cc38b0a598cb2f07d27d86f25233 diff --git a/qtspeech b/qtspeech index cca145e54c8..073886169dd 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit cca145e54c87469627a7c8e1de9747e2a499e30d +Subproject commit 073886169dd875f59d28dd4fc75a20f5e1dac9bd diff --git a/qtsvg b/qtsvg index fdbe89e45c4..9bb275238f3 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit fdbe89e45c4ef075d0b47ff0d62bbe2ec85e9928 +Subproject commit 9bb275238f3eb9b8419fa4df5243bb613cb73b4d diff --git a/qttools b/qttools index f3180b6eb65..ffedf9cf7e6 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f3180b6eb650598ca937943d6cd66da13335d9de +Subproject commit ffedf9cf7e6c52d8b59af47b21e7a29ee23720ec diff --git a/qttranslations b/qttranslations index ec3a7a623ae..cb1857418b3 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit ec3a7a623ae7dc228e7a9795a605c6d7916816ec +Subproject commit cb1857418b36780b0444333f3aa6250ca3780f19 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index e90249aa7c0..e3e57f6f2a2 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit e90249aa7c024b100e80e68d669cc2bce1cf02c2 +Subproject commit e3e57f6f2a2d7e1748c005c0db7a11a68139bbad diff --git a/qtwayland b/qtwayland index 96cfbda63a2..6a7c6eedbaf 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 96cfbda63a249385eef02e7996098079569a13b8 +Subproject commit 6a7c6eedbaf00b1f2102247810987b6d9246f34e diff --git a/qtwebchannel b/qtwebchannel index 6bc9b38c599..dd4ea8c5df1 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 6bc9b38c599cd535191d8f434664b59b8a03de24 +Subproject commit dd4ea8c5df141872df444af770d1672ed60a2253 diff --git a/qtwebengine b/qtwebengine index c0a1d2b8354..3d80c914693 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c0a1d2b8354d213a2d43f1782533ac2716ca860f +Subproject commit 3d80c914693e27dd118d4e07e2eda22713722c90 diff --git a/qtwebglplugin b/qtwebglplugin index da2b09ab2ac..bce14a12280 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit da2b09ab2ac262118e65e1668cff822d59f29116 +Subproject commit bce14a122802425a38173134bceccc33fed71d5b diff --git a/qtwebsockets b/qtwebsockets index 55e06385d52..d469b93b98e 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 55e06385d520c96b0342a5007c6889d936c82845 +Subproject commit d469b93b98e8c23de2fb10a84a71a7456b3c02ae diff --git a/qtwebview b/qtwebview index 0233fb69e00..79a6fb7563a 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 0233fb69e00d9eefc59b3748ef6b7449f37481a1 +Subproject commit 79a6fb7563aaa596136bc5887ef0ba3be941765b diff --git a/qtwinextras b/qtwinextras index 5f1dc16bc68..dc798ad5991 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 5f1dc16bc686851b45beff6f73925e05698eeb09 +Subproject commit dc798ad59910173b5d4870ebed9bcfbc39d29b8d diff --git a/qtx11extras b/qtx11extras index c6a1ebfb151..a175d03c26e 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit c6a1ebfb151167eca65a88afc753980fa5068435 +Subproject commit a175d03c26e550ced994c3c591563f79c06bbe63 diff --git a/qtxmlpatterns b/qtxmlpatterns index 6bea8f96dbb..569c804bf04 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 6bea8f96dbbaf0935cccf9b1623b51d3264368ec +Subproject commit 569c804bf04be76c7213a09c2058d016fad074fe From 5ea800dd4cb506cd3ab2575e9204b61ad95b4687 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 5 Oct 2020 13:13:07 +0000 Subject: [PATCH 046/106] Update submodules on '5.15' in qt/qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0342453e63cf0fd1d2462d8a2ea4ebf622699521 Reviewed-by: Tony Sarajärvi --- qt3d | 2 +- qtbase | 2 +- qtimageformats | 2 +- qtwayland | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index 2b34df423c1..ca051b7dc9b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 2b34df423c1f2d525e341ad11cd2f281d1caf0c6 +Subproject commit ca051b7dc9be2836800fef275b502e46423c48c2 diff --git a/qtbase b/qtbase index 344f60269f3..607297b27cf 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 344f60269f3eada0c2c0fffadb7909268215aebc +Subproject commit 607297b27cf9e03975c08fc1f7ad75f787a34181 diff --git a/qtimageformats b/qtimageformats index 93ae5523192..1cce99ccb1b 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 93ae5523192b6d636a32986d9cae10294bca5a83 +Subproject commit 1cce99ccb1bcb0482e1b132ed634ad0f7ce2d251 diff --git a/qtwayland b/qtwayland index 6a7c6eedbaf..9c8e59a7a6b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 6a7c6eedbaf00b1f2102247810987b6d9246f34e +Subproject commit 9c8e59a7a6b0cfaa7caf899bdb577270c83b9a12 From 91c229fc17054feacb63de186e3419bc5c2f1933 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 11 Oct 2020 23:45:42 +0200 Subject: [PATCH 047/106] Update submodules on '5.15' in qt/qt5 Change-Id: I9503a6d07dca0610cba9714e9495101d5e9ecaed Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index ca051b7dc9b..815fb0e3f11 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ca051b7dc9be2836800fef275b502e46423c48c2 +Subproject commit 815fb0e3f11bf0087277b659ef9ed90739e14a0b diff --git a/qtbase b/qtbase index 607297b27cf..fd839b60a66 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 607297b27cf9e03975c08fc1f7ad75f787a34181 +Subproject commit fd839b60a6617a11385326701449fb6825f81eff diff --git a/qtdeclarative b/qtdeclarative index 95f8cd5632d..dfa0948e936 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 95f8cd5632dcb72ec4fa7910099f210ce5f22078 +Subproject commit dfa0948e936aad3ea823427d5b015c4d906c7113 diff --git a/qtqa b/qtqa index 8afa17c2f67..bb9309475c4 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 8afa17c2f6782ac165cbaff05961bbcef4273aa9 +Subproject commit bb9309475c4075983d90b05a2dbc410f35685a4e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b6280dd2077..51a57c7ea85 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b6280dd207746f32092f5cb2b55b8c5f8ffa44b9 +Subproject commit 51a57c7ea852151235b692475f08915edb16bb90 diff --git a/qtwayland b/qtwayland index 9c8e59a7a6b..65922085c3b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 9c8e59a7a6b0cfaa7caf899bdb577270c83b9a12 +Subproject commit 65922085c3ba302b9049e62c1e132236b726adf9 diff --git a/qtwebengine b/qtwebengine index 3d80c914693..95e32f7648a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3d80c914693e27dd118d4e07e2eda22713722c90 +Subproject commit 95e32f7648a4e0c1e8bece03e6b501f1364e683d From b3326dc04e20bd1e7a455dd4fe00fba4bf0b7445 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 13 Oct 2020 23:46:05 +0200 Subject: [PATCH 048/106] Update submodules on '5.15' in qt/qt5 Change-Id: I05899504c6f14e733afaf66c6bc30c77ab609ce2 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index fd839b60a66..bc294899e58 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fd839b60a6617a11385326701449fb6825f81eff +Subproject commit bc294899e588a743d96a0110f7575902c482a806 diff --git a/qtwayland b/qtwayland index 65922085c3b..45a3a3208a4 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 65922085c3ba302b9049e62c1e132236b726adf9 +Subproject commit 45a3a3208a4243d9b0a6500e3dcd0fcfed2dfcea diff --git a/qtwebengine b/qtwebengine index 95e32f7648a..7eea6be3390 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 95e32f7648a4e0c1e8bece03e6b501f1364e683d +Subproject commit 7eea6be3390166943851eb2619eae520f95488b8 From 5af2672a245113d3d804c7a2e5a4bcee39b5a3be Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Thu, 15 Oct 2020 11:06:29 +0200 Subject: [PATCH 049/106] Qdoc_libclang: Install perl-Digest-MD5 While building Clang 11 for Qt the tests failed due to missing Perl Digest-MD5 package. Change-Id: Iba4156db65ec53bf465ca5b132e6983f1176bc41 Reviewed-by: Alessandro Portale (cherry picked from commit 9251571a53f9f97867c055b3274504409c7ab48b) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh index c5304b21cb7..e3ba503c54b 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh @@ -86,6 +86,8 @@ installPackages+=(rh-nodejs12-nodejs-devel) installPackages+=(java-1.8.0-openjdk-devel) # For receiving shasum installPackages+=(perl-Digest-SHA) +# For Clang 11 tests +installPackages+=(perl-Digest-MD5) # INTEGRITY requirements installPackages+=(glibc.i686) # Enable Qt Bluetooth From f218ac459825358067549a72589343f4c46cb8be Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 15 Oct 2020 23:46:31 +0200 Subject: [PATCH 050/106] Update submodules on '5.15' in qt/qt5 Change-Id: I6618a6e1d300ebbba74b76795b7838b6f7df30f8 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtwayland | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index bc294899e58..52a7f472b06 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bc294899e588a743d96a0110f7575902c482a806 +Subproject commit 52a7f472b06916e4f4d4f00a9ed0aede9a3e6816 diff --git a/qtdeclarative b/qtdeclarative index dfa0948e936..7f87b07cf39 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit dfa0948e936aad3ea823427d5b015c4d906c7113 +Subproject commit 7f87b07cf393707d448b0fa515a33b90c79fc584 diff --git a/qtquickcontrols b/qtquickcontrols index f20d5ba29e9..fc0bbf8a78c 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit f20d5ba29e97b96c9aba39649b853a736986582a +Subproject commit fc0bbf8a78c19a71287c5f37a23d74b723fb35c0 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 51a57c7ea85..c9e58c21684 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 51a57c7ea852151235b692475f08915edb16bb90 +Subproject commit c9e58c2168450fd3b1fe3aca3dd143d5fd0db8c5 diff --git a/qtwayland b/qtwayland index 45a3a3208a4..707b23cf115 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 45a3a3208a4243d9b0a6500e3dcd0fcfed2dfcea +Subproject commit 707b23cf11586304912b3ea87099cf46a0aac912 From bb5fb29f4e1296936b4bd4057fd5d8934d22169b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 18 Oct 2020 23:46:03 +0200 Subject: [PATCH 051/106] Update submodules on '5.15' in qt/qt5 Change-Id: I1a8eb49540797c37ba8d4d4b059e17dd3bfea82e Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtmacextras | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtscript | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/qt3d b/qt3d index 815fb0e3f11..42abb0c194e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 815fb0e3f11bf0087277b659ef9ed90739e14a0b +Subproject commit 42abb0c194e87596b8fce70985244cc41c0b4b20 diff --git a/qtactiveqt b/qtactiveqt index 7d5b1ca45ea..87e97562466 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 7d5b1ca45eaa49388ef5dc1b61aff4c6fc741997 +Subproject commit 87e97562466b76fd757ebdfff8978b34c167a6ae diff --git a/qtandroidextras b/qtandroidextras index 28eea59d45c..ce9aa0c91b8 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 28eea59d45c7f381caaf3da18ae040b7e4bd55a7 +Subproject commit ce9aa0c91b86f386442379a5e653c32437de1ba0 diff --git a/qtbase b/qtbase index 52a7f472b06..29ca6b9d14f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 52a7f472b06916e4f4d4f00a9ed0aede9a3e6816 +Subproject commit 29ca6b9d14fbf9774e9829e59ac5f4e675c2c1d0 diff --git a/qtcharts b/qtcharts index 1a25abd33bf..c082168fba5 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 1a25abd33bf65bae6434c7a7fdd747929ffe2d36 +Subproject commit c082168fba5deb930a01502c54bf2080af53b544 diff --git a/qtdatavis3d b/qtdatavis3d index a3e04c4fd28..c8a251c1834 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit a3e04c4fd28e5df09454c17ad5d48211610e73e9 +Subproject commit c8a251c1834f499c55a616b1ee10f776f068ab8b diff --git a/qtdeclarative b/qtdeclarative index 7f87b07cf39..0f3df189e57 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7f87b07cf393707d448b0fa515a33b90c79fc584 +Subproject commit 0f3df189e57d4c2bddce09380bbed8e0ed1fe2b7 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index a3b37bffa40..82859f6d41d 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit a3b37bffa4083eda2666f369cacdee69371b27d3 +Subproject commit 82859f6d41d741c43c4fd6c089526701028c9495 diff --git a/qtimageformats b/qtimageformats index 1cce99ccb1b..dd8edc701b7 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 1cce99ccb1bcb0482e1b132ed634ad0f7ce2d251 +Subproject commit dd8edc701b7bcd90eddf8f4af824efdc4b21271e diff --git a/qtmacextras b/qtmacextras index 7fa49a1c639..7fd8ca9462d 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 7fa49a1c639e6174f25ed570bea0f3cd261c2fc9 +Subproject commit 7fd8ca9462dddb89674e70d86e86c54c890d832a diff --git a/qtnetworkauth b/qtnetworkauth index 304005c1288..6bfbe5ceeb6 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 304005c1288e8b76138285e051ea51b88d44273a +Subproject commit 6bfbe5ceeb692ca96e43222327edb75b52b6a319 diff --git a/qtpurchasing b/qtpurchasing index 55c9b8325da..839f1b41be3 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 55c9b8325daf15eb5654e8834de6b8fe41ca7f6e +Subproject commit 839f1b41be3f56a05e8f69abc8fbba9d55cff79b diff --git a/qtscript b/qtscript index 00bfde6155e..3825c13da12 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 00bfde6155e2afb9f4881886e51067363d903cf3 +Subproject commit 3825c13da129e073f1966f3da561da7e732126fa diff --git a/qtserialbus b/qtserialbus index a69e258f030..e1dd42f75c6 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit a69e258f0307833dc75deef930021fc8413e4d9d +Subproject commit e1dd42f75c6d6a7330585cfc7efe6b0d61c94337 diff --git a/qtserialport b/qtserialport index 3fa1e369324..27ca2cef37e 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 3fa1e3693249cc38b0a598cb2f07d27d86f25233 +Subproject commit 27ca2cef37e59666de7a038c67dc7e04126cb991 diff --git a/qtspeech b/qtspeech index 073886169dd..07ae7523f97 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 073886169dd875f59d28dd4fc75a20f5e1dac9bd +Subproject commit 07ae7523f97ed0eda6ff5b3257499ba62f530fbe diff --git a/qtsvg b/qtsvg index 9bb275238f3..4433f21a54d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 9bb275238f3eb9b8419fa4df5243bb613cb73b4d +Subproject commit 4433f21a54d1987216b6cd97017a90754103a9d6 diff --git a/qtwayland b/qtwayland index 707b23cf115..2a77384a4f2 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 707b23cf11586304912b3ea87099cf46a0aac912 +Subproject commit 2a77384a4f2485364cefeb825eea63daf13dd3b1 diff --git a/qtwebchannel b/qtwebchannel index dd4ea8c5df1..b616ed1f55e 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit dd4ea8c5df141872df444af770d1672ed60a2253 +Subproject commit b616ed1f55e6fa36da34c8f9752c4b661afbc98d diff --git a/qtwebglplugin b/qtwebglplugin index bce14a12280..e9ce6565d22 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit bce14a122802425a38173134bceccc33fed71d5b +Subproject commit e9ce6565d22dbd6a0c3c115a88956ded060b8014 diff --git a/qtwebsockets b/qtwebsockets index d469b93b98e..953ac709b6b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit d469b93b98e8c23de2fb10a84a71a7456b3c02ae +Subproject commit 953ac709b6bb8b8e9dc3302448faaa8b68e6a9f4 diff --git a/qtwebview b/qtwebview index 79a6fb7563a..779d8246e46 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 79a6fb7563aaa596136bc5887ef0ba3be941765b +Subproject commit 779d8246e46d705809e66e6fcc2600df6ac92471 diff --git a/qtwinextras b/qtwinextras index dc798ad5991..d1fe52bea1c 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit dc798ad59910173b5d4870ebed9bcfbc39d29b8d +Subproject commit d1fe52bea1ce58d86bfc639f28d0f533a1570ae4 diff --git a/qtx11extras b/qtx11extras index a175d03c26e..9a989fbcc65 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit a175d03c26e550ced994c3c591563f79c06bbe63 +Subproject commit 9a989fbcc65b6866e85ce39451419f34e187f80c From 59a40d8a52a23619c74aee23836bf9479ffdd597 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 20 Oct 2020 14:00:29 +0300 Subject: [PATCH 052/106] Provisioning: Enable access to SMB server MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Windows don't allow insecure guest login anymore by default. It need to be enabled through Group Policy restrictions Task-number: QTQAINFRA-3974 Change-Id: I5fd918882c51c01985cd4c1b9f9ed4dec62e07dd Reviewed-by: Tony Sarajärvi (cherry picked from commit 90a6ab728ff2cf99237f75248f1ec75c5b0b03cc) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-windows-10-x86/01-enable-guest-logon.ps1 | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86/01-enable-guest-logon.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/01-enable-guest-logon.ps1 b/coin/provisioning/qtci-windows-10-x86/01-enable-guest-logon.ps1 new file mode 100644 index 00000000000..3cf989d37b6 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/01-enable-guest-logon.ps1 @@ -0,0 +1,2 @@ +# Allow SMB client guest logons to SMB server. +reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /V AllowInsecureGuestAuth /T REG_dWORD /D 1 /F From 2f465dea435acaf6fe7c09f008c51799b94ed342 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 24 Sep 2020 14:13:57 +0300 Subject: [PATCH 053/106] Provisioning: Install colorlog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Needed by packaging scripts Task-number: QTQAINFRA-3918 Change-Id: I30861ecb5f12f79683ad2fec58484b97dee31d7f Reviewed-by: Tony Sarajärvi (cherry picked from commit c053e70593ca917c4a6a132478b3d34631cf507f) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh index e3ba503c54b..b49f562b42c 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh @@ -136,6 +136,9 @@ sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3 sudo pip install --upgrade pip sudo pip install virtualenv wheel +# Needed by packaging scripts +sudo /usr/local/bin/pip3 install colorlog --user + sudo /usr/local/bin/pip3 install wheel # Install all needed packages in a special wheel cache directory /usr/local/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" From 6cccbc6f4196fdcff24656caba20c58a15e62329 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 21 Oct 2020 23:46:46 +0200 Subject: [PATCH 054/106] Update submodules on '5.15' in qt/qt5 Change-Id: Iacde75ce6765d73382c29135cce4cb064ee94ed0 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtsvg | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/qt3d b/qt3d index 42abb0c194e..16a34ffb559 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 42abb0c194e87596b8fce70985244cc41c0b4b20 +Subproject commit 16a34ffb5598837d98d871717c81d07e8e9c6211 diff --git a/qtbase b/qtbase index 29ca6b9d14f..087d7891aa5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 29ca6b9d14fbf9774e9829e59ac5f4e675c2c1d0 +Subproject commit 087d7891aa54084236a27b5b77767e9d5106e108 diff --git a/qtconnectivity b/qtconnectivity index 8e624270b7a..b8b8d881ba5 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 8e624270b7af41fe29844a7971c41c98cd251ec6 +Subproject commit b8b8d881ba560a52cca29b2afe7912cc47c464ef diff --git a/qtdeclarative b/qtdeclarative index 0f3df189e57..d62437be774 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0f3df189e57d4c2bddce09380bbed8e0ed1fe2b7 +Subproject commit d62437be7743bbb5d7697bf2d3bf4b74cc79223e diff --git a/qtdoc b/qtdoc index 2e169757807..85d3a019f85 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2e1697578072216795d1a3642c7bfbcb0a381fbc +Subproject commit 85d3a019f854d16c07e5d3cac1c617aa50626bba diff --git a/qtgamepad b/qtgamepad index e92a0864e8a..5a6c8291cd7 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit e92a0864e8aa434f201c12269c66dd5ba373242e +Subproject commit 5a6c8291cd71ccf7d6f7b30faf94ad942cd1e4a3 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 82859f6d41d..9bbfab7facc 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 82859f6d41d741c43c4fd6c089526701028c9495 +Subproject commit 9bbfab7facc78d0ba6b41794e6003fd4bcccff80 diff --git a/qtmultimedia b/qtmultimedia index 4b26133b1ca..4ca84a8ae95 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4b26133b1cac084a61dbbf68b3fff711ca49f712 +Subproject commit 4ca84a8ae95d2703d2459d6335c4420ae32b37b6 diff --git a/qtnetworkauth b/qtnetworkauth index 6bfbe5ceeb6..c7dba079632 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 6bfbe5ceeb692ca96e43222327edb75b52b6a319 +Subproject commit c7dba0796324c9846ffb9dac470045da35520337 diff --git a/qtquickcontrols b/qtquickcontrols index fc0bbf8a78c..8b05eb5e000 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit fc0bbf8a78c19a71287c5f37a23d74b723fb35c0 +Subproject commit 8b05eb5e00051cadadd392ab3e731079fcd3d2fa diff --git a/qtquickcontrols2 b/qtquickcontrols2 index c9e58c21684..a1b0f708e6a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit c9e58c2168450fd3b1fe3aca3dd143d5fd0db8c5 +Subproject commit a1b0f708e6a22297bdd8af2cf8c461de5da7a16e diff --git a/qtscxml b/qtscxml index a34700697ed..95aa78be795 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit a34700697ed9a46786c8b56356dc19cc871be920 +Subproject commit 95aa78be795a862b95371afa75e1417029ec0a16 diff --git a/qtsensors b/qtsensors index f230ae749d9..358e520121c 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit f230ae749d91bede85a27918bce3c88897ca713f +Subproject commit 358e520121c448fcb3fce2eec64a5f3633825d16 diff --git a/qtsvg b/qtsvg index 4433f21a54d..7dce014c146 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 4433f21a54d1987216b6cd97017a90754103a9d6 +Subproject commit 7dce014c1469f77728bf1ac04b47b9d555189184 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index e3e57f6f2a2..4019b0739d6 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit e3e57f6f2a2d7e1748c005c0db7a11a68139bbad +Subproject commit 4019b0739d6ecadcf855e1b3a353f3075b36d14f diff --git a/qtwayland b/qtwayland index 2a77384a4f2..f637fcdbbab 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2a77384a4f2485364cefeb825eea63daf13dd3b1 +Subproject commit f637fcdbbabeb060cdd223d8bc6662d5cace6b90 diff --git a/qtwebengine b/qtwebengine index 7eea6be3390..1bbd0db1190 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7eea6be3390166943851eb2619eae520f95488b8 +Subproject commit 1bbd0db1190193f29297881b42c25947b4bf87bd diff --git a/qtwinextras b/qtwinextras index d1fe52bea1c..40584f80388 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit d1fe52bea1ce58d86bfc639f28d0f533a1570ae4 +Subproject commit 40584f80388ce8eedc6f557d28eb3767b9b5f78b diff --git a/qtxmlpatterns b/qtxmlpatterns index 569c804bf04..f2e79ee96e9 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 569c804bf04be76c7213a09c2058d016fad074fe +Subproject commit f2e79ee96e94249756191760c844c853044cf77e From 785c31d540bd1ee8572ee27f2a4b4354ec241f06 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 24 Oct 2020 23:45:45 +0200 Subject: [PATCH 055/106] Update submodules on '5.15' in qt/qt5 Change-Id: I6760d2f4565b5dee849e01fed66ce7c7c48b4d88 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtnetworkauth | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwayland | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 16a34ffb559..00a757f3bb3 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 16a34ffb5598837d98d871717c81d07e8e9c6211 +Subproject commit 00a757f3bb3b021b6d6ae2afa05a2224af25de52 diff --git a/qtbase b/qtbase index 087d7891aa5..34d3f2e2192 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 087d7891aa54084236a27b5b77767e9d5106e108 +Subproject commit 34d3f2e21921a7eef8f6241a178598f9eaf0a8a9 diff --git a/qtcharts b/qtcharts index c082168fba5..07f28ce1eab 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit c082168fba5deb930a01502c54bf2080af53b544 +Subproject commit 07f28ce1eab983a49e661855ee11ffbd624f0083 diff --git a/qtdeclarative b/qtdeclarative index d62437be774..2fe4bbd0aef 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d62437be7743bbb5d7697bf2d3bf4b74cc79223e +Subproject commit 2fe4bbd0aef2efb825802ad21a93c43323e1bb87 diff --git a/qtnetworkauth b/qtnetworkauth index c7dba079632..129044b2c2d 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit c7dba0796324c9846ffb9dac470045da35520337 +Subproject commit 129044b2c2d812b779c42afbe5163b2135645b13 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index a1b0f708e6a..a0899012f44 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit a1b0f708e6a22297bdd8af2cf8c461de5da7a16e +Subproject commit a0899012f44806957d0254c8e76cca97adb624f6 diff --git a/qttools b/qttools index ffedf9cf7e6..72b5a4dcae9 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ffedf9cf7e6c52d8b59af47b21e7a29ee23720ec +Subproject commit 72b5a4dcae9e9be4a6d66884d3cc0bfb2d692477 diff --git a/qtwayland b/qtwayland index f637fcdbbab..8824452f5b2 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f637fcdbbabeb060cdd223d8bc6662d5cace6b90 +Subproject commit 8824452f5b259ab1f295f1237789b2693ae8f232 From 8b17964ab1e7adf11c1e026da25084108545fc12 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 9 Apr 2019 09:20:34 +0300 Subject: [PATCH 056/106] Remove DisableTest flag from MinGW builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We should have tests up and running for those targets we are doing prebuild binaries. Task-number: QTBUG-74542 Change-Id: I7bdc0f324ed7d35aa8bc329af4c9d11e641d9979 Reviewed-by: Qt CI Bot Reviewed-by: Tony Sarajärvi Reviewed-by: Friedemann Kleint --- coin/platform_configs/qt5.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 2e511149d9f..b359f966bd6 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -17,13 +17,13 @@ Configurations: Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib' - Template: 'qtci-windows-10-x86_64-51' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib' - Template: 'qtci-windows-10-x86_64-51' From d562974cb800de07aa8eaaab8190df996ced3724 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 21 Oct 2020 20:56:24 +0300 Subject: [PATCH 057/106] Provisioning: Enable access to SMB server in Windows 10 x64 Windows don't allow insecure guest login anymore by default. It need to be enabled through Group Policy restrictions Task-number: QTQAINFRA-3980 Change-Id: I767e9c87ca3ee4737e312142ecefb94ee2b2b828 Reviewed-by: Timur Pocheptsov (cherry picked from commit 586856e180b65470d0e5d119081e18abbde83152) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-windows-10-x86_64/01-enable-guest-logon.ps1 | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1 new file mode 100644 index 00000000000..3cf989d37b6 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1 @@ -0,0 +1,2 @@ +# Allow SMB client guest logons to SMB server. +reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /V AllowInsecureGuestAuth /T REG_dWORD /D 1 /F From 42d631229bacab1d6b9900cf021d1592e60ef923 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 25 Sep 2020 15:19:13 +0300 Subject: [PATCH 058/106] Provisioning: Add system GCC versions to versions.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently GCC versions which comes with the system are missing from versions.txt. This change will add those Task-number: QTQAINFRA-3933 Change-Id: I1934e6257acf92d72dcb382884aad60503b7b32f Reviewed-by: Tony Sarajärvi (cherry picked from commit dff15e0a716caf5510521daa9e9f0df4c17f9cad) --- .../qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh | 4 ++++ .../qtci-linux-SLES-15-x86_64/02-zypperpackages.sh | 9 ++++++++- .../qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh index b49f562b42c..405d0492aa3 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh @@ -146,3 +146,7 @@ sudo /usr/local/bin/pip3 install wheel # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" + +gccVersion="$(gcc --version |grep gcc |cut -b 11-16)" +echo "GCC = $gccVersion" >> versions.txt + diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh index 8c596142e71..a366e80721c 100755 --- a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -105,3 +105,10 @@ sudo zypper -nq install sqlite3 sqlite3-devel # Java - needed by RTA jenkins sudo zypper -nq install java + +# open-vm-tools requires update. Version in tier1 is broken and causes segfault on boot. +sudo zypper -nq update open-vm-tools + +gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +echo "GCC = $gccVersion" >> versions.txt + diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh index b509ff6ce2b..d4fddd00c82 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh @@ -50,3 +50,5 @@ sudo zypper -nq install cups-devel #speech-dispatcher sudo zypper -nq install libspeechd-devel +gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +echo "GCC = $gccVersion" >> versions.txt From 9f39df9e30f283b0da7e9f2aaa020d4187c92012 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 29 Oct 2020 14:13:40 +0200 Subject: [PATCH 059/106] Upgrade msys2 package and the installation script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change will upgrade the msys2 package Change also updates the script to use cached prebuilt package if available. This will also remove unneeded x86 installation Task-number: QTQAINFRA-3986 Change-Id: Ia6299f9d4750376676276a75613e7f1098de4102 Reviewed-by: Tony Sarajärvi (cherry picked from commit 134c2a1cb0d41d773577d4c499004b93fb03d3c9) --- .../common/windows/install-msys2.ps1 | 60 ++++++++++--------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index 784b09dc190..2be0d35c116 100644 --- a/coin/provisioning/common/windows/install-msys2.ps1 +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -33,46 +33,50 @@ . "$PSScriptRoot\helpers.ps1" -# This script installs 7-Zip +# This script will installs msys2 -$version = "20181211" +$version = "20200903" $prog = "msys2" -if (Is64BitWinHost) { - $arch = "x86_64" - $sha1 = "d689ff74fd060934bd7aaf458a11db67833463c2" - $folder = "msys64" -} else { - $arch = "i686" - $sha1 = "928f9d1537d1a77dc7f2adab74fb438e7d11a98e" - $folder = "msys32" -} -$package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz" +$arch = "x86_64" +$sha1 = "5a1644585fac2d58855d48b4ba4a92579a14cf03" +$sha1_prebuilt = "d86d45d72228f53f7ae060771bc95b6f54c703c8" +$folder = "msys64" +$package_prebuilt = $folder + "_" + $version + "_prebuilt.7z" +$package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz" +$url_cache_prebuilt = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package_prebuilt" $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package" $url_official = "http://repo.msys2.org/distrib/$arch/$package" -$PackagePath = "C:\Windows\Temp\$package" $TargetLocation = "C:\Utils" -Download $url_official $url_cache $PackagePath -Verify-Checksum $PackagePath $sha1 -Extract-tar_gz $PackagePath $TargetLocation -$msys = "$TargetLocation\$folder\msys2_shell.cmd" +if ((Test-Path $url_cache_prebuilt)) { + $PackagePath = "C:\Windows\Temp\$package_prebuilt" + Download $url_cache_prebuilt $url_cache_prebuilt $PackagePath + Verify-Checksum $PackagePath $sha1_prebuilt + Extract-7Zip $PackagePath $TargetLocation +} else { + $PackagePath = "C:\Windows\Temp\$package" + Download $url_official $url_cache $PackagePath + Verify-Checksum $PackagePath $sha1 + Extract-tar_gz $PackagePath $TargetLocation + $msys = "$TargetLocation\$folder\msys2_shell.cmd" -# install perl -# Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file. -cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`"" -Start-Sleep -s 30 -cmd /c "$msys `"-l`" `"-c`" `"cpan -i Text::Template Test::More`"" + # install perl + # Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file. + cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`"" + Start-Sleep -s 60 + cmd /c "$msys `"-l`" `"-c`" `"echo y | cpan -i Text::Template Test::More`"" -# Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed. -# Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process. -Start-Sleep -s 180 -if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent } -if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr } + # Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed. + # Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process. + Start-Sleep -s 360 + if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent } + if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr } +} Write-Host "Cleaning $PackagePath.." Remove-Item -Recurse -Force -Path "$PackagePath" -Write-Output "7-Zip = $version" >> ~\versions.txt +Write-Output "msys2 = $version" >> ~\versions.txt From 114fc83609e2afc20165f31e3c8b849ee136bb39 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 11 Sep 2020 15:45:20 +0300 Subject: [PATCH 060/106] Provisioning: Update MSVC 2019 to version 16.7.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Visual Studio 2019 can be updated with version specific online installer Change-Id: I1ec1f96e68e8e3440d85240d09eec59a421708db Reviewed-by: Tony Sarajärvi (cherry picked from commit b9158ca889fdae7435bd348467a0840f186841e0) --- .../common/windows/update-msvc2019.ps1 | 71 +++++++++++++++++++ .../qtci-windows-10-x86_64/05-msvc.ps1 | 7 +- .../05-update-msvc2019.ps1 | 1 + 3 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 coin/provisioning/common/windows/update-msvc2019.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/05-update-msvc2019.ps1 diff --git a/coin/provisioning/common/windows/update-msvc2019.ps1 b/coin/provisioning/common/windows/update-msvc2019.ps1 new file mode 100644 index 00000000000..0b0f384db7b --- /dev/null +++ b/coin/provisioning/common/windows/update-msvc2019.ps1 @@ -0,0 +1,71 @@ +############################################################################ +## +## Copyright (C) 2020 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +# This script will update MSVC 2019. +# NOTE! Visual Studio is pre-installed to tier 1 image so this script won't install the whole Visual Studio. See ../../../pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt +# MSVC 2019 online installers can be found from here https://docs.microsoft.com/en-us/visualstudio/releases/2019/history#installing-an-earlier-release + +$version = "16_7_5" +$urlCache_vsInstaller = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msvc\vs2019_Professional_$version.exe" +$urlOfficial_vsInstaller = "https://download.visualstudio.microsoft.com/download/pr/e8bc3741-cb70-42aa-9b4e-2bd497de85dd/74b4e599138d5b5824d87ee657b78cbdeb3716f58a9645047e53bb5f68131516/vs_Professional.exe" +$sha1_vsInstaller = "70062274c1ae79f5f0f7cb91192347abc1ebcb00" +$urlCache_buildToolsInstaller = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msvc\vs2019_BuildTools_$version.exe" +$urlOfficial_buildToolsInstaller = "https://download.visualstudio.microsoft.com/download/pr/e8bc3741-cb70-42aa-9b4e-2bd497de85dd/f3713de3e01b7829d529f67d6240116b73cc0743974bb5373a052f9629cc24d2/vs_BuildTools.exe" +$sha1_buildToolsInstaller = "efb4600bf9bd09adf55a36e2e5d0d47a3abd481e" +$installerPath = "C:\Windows\Temp\installer.exe" + +function Install { + + Param ( + [string] $urlOfficial = $(BadParam("Official url path")), + [string] $urlCache = $(BadParam("Cached url path")), + [string] $sha1 = $(BadParam("SHA1 checksum of the file")) + + ) + + Write-Host "Installing msvc 2019 $version" + Download $urlOfficial $urlCache $installerPath + Verify-Checksum $installerPath $sha1 + Run-Executable "$installerPath" "update --passive --wait" + Remove-Item -Force -Path $installerPath +} + +Install $urlOfficial_vsInstaller $urlCache_vsInstaller $sha1_vsInstaller +Install $urlOfficial_buildToolsInstaller $urlCache_buildToolsInstaller $sha1_buildToolsInstaller + +$msvc2019Version = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property catalog_productDisplayVersion 2`>`&1) + +Write-Output "Visual Studio 2019 = $msvc2019Version" >> ~\versions.txt +Write-Output "Visual Studio 2019 Build Tools = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 index 72ac1ca7448..b2949632cc6 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -36,8 +36,5 @@ # MSVC 2015 Update 3 Write-Output "Visual Studio 2015 = Version 14.0.25431.01 Update 3" >> ~\versions.txt -# MSVC 2017 -Write-Output "Visual Studio 2017 = Version 15.8.5" >> ~\versions.txt +# MSVC 2019 and Build Tools are pre-provisioned, but the updating happens with "$PSScriptRoot\..\common\windows\update-msvc2019.ps1" -# MSVC 2017 Build Tools -Write-Output "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-update-msvc2019.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-update-msvc2019.ps1 new file mode 100644 index 00000000000..3dc1439ab9f --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/05-update-msvc2019.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\update-msvc2019.ps1" From 75feb54bcc1e85d8dbe4699c557dcf2c79dd4eba Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 6 Nov 2020 11:41:04 +0000 Subject: [PATCH 061/106] Update submodules on '5.15' in qt/qt5 Change-Id: I80f745d26270f0cdfe56519f5dab6e15e2e84761 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/qt3d b/qt3d index 00a757f3bb3..a8a212ebbd8 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 00a757f3bb3b021b6d6ae2afa05a2224af25de52 +Subproject commit a8a212ebbd82bad183aff0bc53d851c66c7fd225 diff --git a/qtactiveqt b/qtactiveqt index 87e97562466..f0d03da0e37 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 87e97562466b76fd757ebdfff8978b34c167a6ae +Subproject commit f0d03da0e37a84029a4eae1733813521482ac1fb diff --git a/qtandroidextras b/qtandroidextras index ce9aa0c91b8..8cce1098c59 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit ce9aa0c91b86f386442379a5e653c32437de1ba0 +Subproject commit 8cce1098c59534352aa0f343ea73861f603ac04a diff --git a/qtbase b/qtbase index 34d3f2e2192..bf8908f5f9b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 34d3f2e21921a7eef8f6241a178598f9eaf0a8a9 +Subproject commit bf8908f5f9ba93da310c7a9ea2710abc392ed2bc diff --git a/qtcharts b/qtcharts index 07f28ce1eab..130463160b4 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 07f28ce1eab983a49e661855ee11ffbd624f0083 +Subproject commit 130463160b4923069eb98da49edaf7d93180f4f8 diff --git a/qtconnectivity b/qtconnectivity index b8b8d881ba5..69a87a9b831 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b8b8d881ba560a52cca29b2afe7912cc47c464ef +Subproject commit 69a87a9b831e36a578594a0a13130c384ad03121 diff --git a/qtdatavis3d b/qtdatavis3d index c8a251c1834..c085311c02d 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit c8a251c1834f499c55a616b1ee10f776f068ab8b +Subproject commit c085311c02dd216e5a041b90c164d55b3cf3ce92 diff --git a/qtdeclarative b/qtdeclarative index 2fe4bbd0aef..d27e0cc2a41 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2fe4bbd0aef2efb825802ad21a93c43323e1bb87 +Subproject commit d27e0cc2a41c229c5b4085b2d78c4328a82baecd diff --git a/qtdoc b/qtdoc index 85d3a019f85..3c394507e17 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 85d3a019f854d16c07e5d3cac1c617aa50626bba +Subproject commit 3c394507e172e7744275dc049c430966febe56d7 diff --git a/qtgamepad b/qtgamepad index 5a6c8291cd7..64afa18a0a1 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 5a6c8291cd71ccf7d6f7b30faf94ad942cd1e4a3 +Subproject commit 64afa18a0a1e9588060e2e6d917bb01ccdd48a81 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 9bbfab7facc..c36998dc158 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 9bbfab7facc78d0ba6b41794e6003fd4bcccff80 +Subproject commit c36998dc1581167b12cc3de8e4ac68c2a5d9f76e diff --git a/qtimageformats b/qtimageformats index dd8edc701b7..cb82c743108 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit dd8edc701b7bcd90eddf8f4af824efdc4b21271e +Subproject commit cb82c74310837fe4e832c8ab72176a5d63e4355f diff --git a/qtlocation b/qtlocation index 9ac778b23aa..bf8075b3e11 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 9ac778b23aa77c62470efcd6bb3afe57576c0aa7 +Subproject commit bf8075b3e11f7e33dd5c1197066e2f5f7a6e2d72 diff --git a/qtlottie b/qtlottie index b182dcd78a3..fa8c8bfc674 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit b182dcd78a35b4667b2568857b7719d555c7fddb +Subproject commit fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 diff --git a/qtmacextras b/qtmacextras index 7fd8ca9462d..e7289696869 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 7fd8ca9462dddb89674e70d86e86c54c890d832a +Subproject commit e72896968697e2a8af16a312e1560948e4c40f30 diff --git a/qtmultimedia b/qtmultimedia index 4ca84a8ae95..5b4e84ed4b9 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4ca84a8ae95d2703d2459d6335c4420ae32b37b6 +Subproject commit 5b4e84ed4b93f849aa9367010ddb8c00c4030f6d diff --git a/qtnetworkauth b/qtnetworkauth index 129044b2c2d..53870ee9bb9 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 129044b2c2d812b779c42afbe5163b2135645b13 +Subproject commit 53870ee9bb9117702cd1f11cb1c5d1cfc2d5394a diff --git a/qtpurchasing b/qtpurchasing index 839f1b41be3..cbf444fb570 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 839f1b41be3f56a05e8f69abc8fbba9d55cff79b +Subproject commit cbf444fb570ca4f4ca21d963d2ae4010f10d473e diff --git a/qtqa b/qtqa index bb9309475c4..e8b1cc0b130 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit bb9309475c4075983d90b05a2dbc410f35685a4e +Subproject commit e8b1cc0b130976a7a60cd3b5c08a6355b089ae77 diff --git a/qtquick3d b/qtquick3d index 6722290ac00..b49d1bf8b4c 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 6722290ac002f7a5c13261215d836947cae52684 +Subproject commit b49d1bf8b4cd02e751bde0b290ad427e25f68757 diff --git a/qtquickcontrols b/qtquickcontrols index 8b05eb5e000..daedf298912 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 8b05eb5e00051cadadd392ab3e731079fcd3d2fa +Subproject commit daedf29891225170d9bf4be182231ab399bba5a1 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index a0899012f44..551841db557 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit a0899012f44806957d0254c8e76cca97adb624f6 +Subproject commit 551841db557c1d726fc2b3987d93a71a4a346cae diff --git a/qtquicktimeline b/qtquicktimeline index 725369606ac..5e8b98101ca 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 725369606acc67783c2b6121a15b6b0b566e9e96 +Subproject commit 5e8b98101ca67873216954067ddcb3c10e53c30d diff --git a/qtremoteobjects b/qtremoteobjects index 220fcba0cb8..4d6d1e35fb8 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 220fcba0cb8e59ab99236ed4e94395852b1e49d2 +Subproject commit 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 diff --git a/qtscript b/qtscript index 3825c13da12..5be95f966aa 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 3825c13da129e073f1966f3da561da7e732126fa +Subproject commit 5be95f966aabc5170f0aacfd4b0a46217241bfd6 diff --git a/qtscxml b/qtscxml index 95aa78be795..7a15000f42c 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 95aa78be795a862b95371afa75e1417029ec0a16 +Subproject commit 7a15000f42c7a3171719727cd056f82a78244ed7 diff --git a/qtsensors b/qtsensors index 358e520121c..921a31375f2 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 358e520121c448fcb3fce2eec64a5f3633825d16 +Subproject commit 921a31375f29e429e95352b08b2b9dbfea663cb1 diff --git a/qtserialbus b/qtserialbus index e1dd42f75c6..8884c5e43df 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit e1dd42f75c6d6a7330585cfc7efe6b0d61c94337 +Subproject commit 8884c5e43df846deac5a0c7c290eeb633d6bfe32 diff --git a/qtserialport b/qtserialport index 27ca2cef37e..941d1d8560d 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 27ca2cef37e59666de7a038c67dc7e04126cb991 +Subproject commit 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 diff --git a/qtspeech b/qtspeech index 07ae7523f97..a0efc38377e 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 07ae7523f97ed0eda6ff5b3257499ba62f530fbe +Subproject commit a0efc38377e5bf7eed2d354d1cb4d7a0d5dc7e1b diff --git a/qtsvg b/qtsvg index 7dce014c146..9aac88424a1 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 7dce014c1469f77728bf1ac04b47b9d555189184 +Subproject commit 9aac88424a1b76e0198b52437af58a6d94aff8e9 diff --git a/qttools b/qttools index 72b5a4dcae9..ca9cef2f6a9 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 72b5a4dcae9e9be4a6d66884d3cc0bfb2d692477 +Subproject commit ca9cef2f6a9282cdfbdb8d2c46c4508c6da936bd diff --git a/qttranslations b/qttranslations index cb1857418b3..d6b52360ea3 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit cb1857418b36780b0444333f3aa6250ca3780f19 +Subproject commit d6b52360ea35afac259dc2875e012e8526873c4b diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 4019b0739d6..0c18cf4b245 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 4019b0739d6ecadcf855e1b3a353f3075b36d14f +Subproject commit 0c18cf4b245aec7dd1652fd1effb155275e71064 diff --git a/qtwayland b/qtwayland index 8824452f5b2..88c8df4eab8 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8824452f5b259ab1f295f1237789b2693ae8f232 +Subproject commit 88c8df4eab81316bc055c8be82b0febc70330dbe diff --git a/qtwebchannel b/qtwebchannel index b616ed1f55e..47be9a51b01 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit b616ed1f55e6fa36da34c8f9752c4b661afbc98d +Subproject commit 47be9a51b01d9fd9e7f6dca81e98d4eedcec6d38 diff --git a/qtwebengine b/qtwebengine index 1bbd0db1190..bdb887b8743 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1bbd0db1190193f29297881b42c25947b4bf87bd +Subproject commit bdb887b8743faaa67d1f17b2f473c7b5b08de137 diff --git a/qtwebglplugin b/qtwebglplugin index e9ce6565d22..550a8cee241 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit e9ce6565d22dbd6a0c3c115a88956ded060b8014 +Subproject commit 550a8cee241bbf8c11863dec9587d579dcb1108b diff --git a/qtwebsockets b/qtwebsockets index 953ac709b6b..1a556baf525 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 953ac709b6bb8b8e9dc3302448faaa8b68e6a9f4 +Subproject commit 1a556baf525ec5d6b03c40e890ee861da829a7b7 diff --git a/qtwebview b/qtwebview index 779d8246e46..920de5f1cd9 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 779d8246e46d705809e66e6fcc2600df6ac92471 +Subproject commit 920de5f1cd9f9001cfef1bfd2c19e6720793362f diff --git a/qtwinextras b/qtwinextras index 40584f80388..3df03dab21f 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 40584f80388ce8eedc6f557d28eb3767b9b5f78b +Subproject commit 3df03dab21f3e84d5a7274c64dd879854ca1bfe7 diff --git a/qtx11extras b/qtx11extras index 9a989fbcc65..3898f5484fd 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 9a989fbcc65b6866e85ce39451419f34e187f80c +Subproject commit 3898f5484fd4864b047729bfeda9a1222f32364f diff --git a/qtxmlpatterns b/qtxmlpatterns index f2e79ee96e9..189e28d0aff 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit f2e79ee96e94249756191760c844c853044cf77e +Subproject commit 189e28d0aff1f3d7960228ba318b83e3cadac98c From 5657cb25181a260020d6d8ff11862937a4757caf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 9 Nov 2020 23:46:23 +0100 Subject: [PATCH 062/106] Update submodules on '5.15' in qt/qt5 Change-Id: Ife4a9e421022b542cdcef7959f168019da3fa669 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtlocation | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index bf8908f5f9b..ac60faa58e8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bf8908f5f9ba93da310c7a9ea2710abc392ed2bc +Subproject commit ac60faa58e8f059e46161a3c7563f23831acc37e diff --git a/qtlocation b/qtlocation index bf8075b3e11..861e372b6ad 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit bf8075b3e11f7e33dd5c1197066e2f5f7a6e2d72 +Subproject commit 861e372b6ad81570d4f496e42fb25a6699b72f2f diff --git a/qtquick3d b/qtquick3d index b49d1bf8b4c..307d32f05d6 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit b49d1bf8b4cd02e751bde0b290ad427e25f68757 +Subproject commit 307d32f05d612f0e34d689c34efbf7e1f99eeebf diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 551841db557..c4242c05d0b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 551841db557c1d726fc2b3987d93a71a4a346cae +Subproject commit c4242c05d0bc1a833487214497df93382293bc36 diff --git a/qtwebengine b/qtwebengine index bdb887b8743..f93900ec2e5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit bdb887b8743faaa67d1f17b2f473c7b5b08de137 +Subproject commit f93900ec2e5e4289f562b630821650f7c3f8f906 From a70656119d414f728af042ed848b7bbc41c081cf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 11 Nov 2020 23:46:09 +0100 Subject: [PATCH 063/106] Update submodules on '5.15' in qt/qt5 Change-Id: I041cd62fc7e88209a894e4b2651e4eb9b5095723 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index ac60faa58e8..1b1ce981d48 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ac60faa58e8f059e46161a3c7563f23831acc37e +Subproject commit 1b1ce981d485cdf88d19e51707fd1a95d19d075f diff --git a/qtqa b/qtqa index e8b1cc0b130..db367270e4a 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e8b1cc0b130976a7a60cd3b5c08a6355b089ae77 +Subproject commit db367270e4a1624396505a0c883882bd26ed3824 diff --git a/qtquickcontrols b/qtquickcontrols index daedf298912..cf3f6d7fec8 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit daedf29891225170d9bf4be182231ab399bba5a1 +Subproject commit cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index c4242c05d0b..a2593ff9cf5 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit c4242c05d0bc1a833487214497df93382293bc36 +Subproject commit a2593ff9cf5d0af885c20c2e9f9faa6ca4f1c1a3 diff --git a/qttools b/qttools index ca9cef2f6a9..6dc0f1f51ab 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ca9cef2f6a9282cdfbdb8d2c46c4508c6da936bd +Subproject commit 6dc0f1f51ab4fbc907650713d8310126ffb0af3a diff --git a/qtwebengine b/qtwebengine index f93900ec2e5..8f093f4f9cc 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f93900ec2e5e4289f562b630821650f7c3f8f906 +Subproject commit 8f093f4f9cc48df82d639906a0a6d13231e0d6e0 From 7679fdac8f822dc1567210d24a60b9b203a1f01d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 12 Nov 2020 23:46:22 +0100 Subject: [PATCH 064/106] Update submodules on '5.15' in qt/qt5 Change-Id: I246afdd7216da01980bbbc22419e3d47ce3176d4 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qttools | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 1b1ce981d48..71f457d9b23 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1b1ce981d485cdf88d19e51707fd1a95d19d075f +Subproject commit 71f457d9b232449cf75293e63f3886b2c18d631a diff --git a/qtdeclarative b/qtdeclarative index d27e0cc2a41..4ee1462686d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d27e0cc2a41c229c5b4085b2d78c4328a82baecd +Subproject commit 4ee1462686dc12eb463f5ba6b378d43a39aed074 diff --git a/qtdoc b/qtdoc index 3c394507e17..8dba71ff1a2 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3c394507e172e7744275dc049c430966febe56d7 +Subproject commit 8dba71ff1a2614e6e01fdcb82fb74dbf013c725b diff --git a/qtqa b/qtqa index db367270e4a..dd0f07a87ec 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit db367270e4a1624396505a0c883882bd26ed3824 +Subproject commit dd0f07a87ecfc596162c28a5dc60f8de590abfde diff --git a/qtquick3d b/qtquick3d index 307d32f05d6..92873b57b9c 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 307d32f05d612f0e34d689c34efbf7e1f99eeebf +Subproject commit 92873b57b9c342f9fbd86520f2b304967c64d96b diff --git a/qttools b/qttools index 6dc0f1f51ab..02eed75d166 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6dc0f1f51ab4fbc907650713d8310126ffb0af3a +Subproject commit 02eed75d1661371fb76b496dfd08cbd198737b35 From f3b2ba1f1055aec414d93346a305b460827b4afc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 15 Nov 2020 23:46:11 +0100 Subject: [PATCH 065/106] Update submodules on '5.15' in qt/qt5 Change-Id: I8b229e7e25cb62dfca2872df381b429cc8b93cdd Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdoc | 2 +- qtqa | 2 +- qtwayland | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 71f457d9b23..82121b2fbf8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 71f457d9b232449cf75293e63f3886b2c18d631a +Subproject commit 82121b2fbf80fc39d8a7bab9e8e9a8c545f1ffd3 diff --git a/qtdoc b/qtdoc index 8dba71ff1a2..90ccf92b66b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8dba71ff1a2614e6e01fdcb82fb74dbf013c725b +Subproject commit 90ccf92b66b7629a856a45a28947d0cb1699a386 diff --git a/qtqa b/qtqa index dd0f07a87ec..39d778883e0 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit dd0f07a87ecfc596162c28a5dc60f8de590abfde +Subproject commit 39d778883e0881dc97876a25a01711cfb6be6824 diff --git a/qtwayland b/qtwayland index 88c8df4eab8..e5c272423d1 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 88c8df4eab81316bc055c8be82b0febc70330dbe +Subproject commit e5c272423d1bba2825086b82fd97499237a6fa4b From 09071b67bfa2e93e8a34024c23530e24fbf97c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Fri, 11 Sep 2020 08:26:47 +0300 Subject: [PATCH 066/106] Add missing Squish installation to win10 x86 Squish archive Win10 x86 archive was missing msvc142 x86 package. Change-Id: I532c3a1129d75968c22b721390ff474548e642bf Reviewed-by: Heikki Halmet (cherry picked from commit b43c199d4add1a1fee19cf5076047e735b72e006) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/windows/squishInstall.ps1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 518de783d7a..c615f9eb9d3 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -40,7 +40,7 @@ $version = "6.6.1" $qtBranch = "515x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" -$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build" +$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable" $licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" # Squish license @@ -62,7 +62,9 @@ if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { $sha1 = "17b5bec83f448877e42e5effdc7daf723d157800" } else { - $sha1 = "1e6c1b3935e1c1bcdd28ec2511f24b8656d3ee6a" + $sha1 = "9c0fc186605522ac0ac11066c10c3f3e8a95a705" + #Remove special handling when all packages are in same dir, exception now for win10 x86->the archive had to be rebuild + $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\6.6.1_rerun" } } elseif ($OSVersion -eq "Windows 7 Enterprise") { $winVersion = "win7" @@ -70,7 +72,7 @@ if ($OSVersion -eq "Windows 10 Enterprise") { } $squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip" -Copy-Item "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\$squishArchive" "C:\Utils" +Copy-Item "$squishUrl\$squishArchive" "C:\Utils" Verify-Checksum "C:\Utils\$squishArchive" $sha1 Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils" Rename-Item "$squishPackage" "$targetDir" From 16955af5b4a3605dfd9474c7e23e95f8c764c512 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 18 Nov 2020 07:31:22 +0200 Subject: [PATCH 067/106] Provisioning: Remove rogue RHEL 7.4 provisioning file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RedHat 7.4 isn't supported in 6.0 or in 5.15 branches Change-Id: Ia3ad450a944884035ec3a822e09f73c6970450d0 Reviewed-by: Tony Sarajärvi (cherry picked from commit c20aba6f043e87603ae5aeab232919c65101230e) Reviewed-by: Qt Cherry-pick Bot --- .../90-python-modules.sh | 39 ------------------- 1 file changed, 39 deletions(-) delete mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh deleted file mode 100755 index 8a3fc7b978f..00000000000 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-python-modules.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2019 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/unix/python-modules.sh -source "${BASH_SOURCE%/*}/../common/unix/python-modules.sh" From 790420ae0178e21865a14d523962e9f3b07d7091 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 24 Nov 2020 13:05:34 +0200 Subject: [PATCH 068/106] Android: update build tools and SDK level to 29 in CI Change-Id: I6f831882f1e4c2ba68cbd70d03b72a9337211fbf Reviewed-by: BogDan Vatra (cherry picked from commit 9b5c3f0a6d558b5604208e32c29c7a5a1d5a567e) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/linux/android_linux.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index ca9110b8ef7..01de5f077ba 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -55,8 +55,8 @@ toolsVersion="r26.1.1" toolsFile="sdk-tools-linux-4333796.zip" ndkVersion="r20" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" -sdkBuildToolsVersion="28.0.3" -sdkApiLevel="android-28" +sdkBuildToolsVersion="29.0.3" +sdkApiLevel="android-29" toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" ndkSha1="8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff" From 5e37f2de209497af7a0cc402f6e9c4d6582ef476 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 28 Nov 2020 23:46:01 +0100 Subject: [PATCH 069/106] Update submodules on '5.15' in qt/qt5 Change-Id: I25dc2eacfeee6220d7302424301688ab8458086b Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index a8a212ebbd8..c5845d67be0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a8a212ebbd82bad183aff0bc53d851c66c7fd225 +Subproject commit c5845d67be03d0f1f538422ba1ad181442b09819 diff --git a/qtbase b/qtbase index 82121b2fbf8..833214ee03f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 82121b2fbf80fc39d8a7bab9e8e9a8c545f1ffd3 +Subproject commit 833214ee03f2d692a2eb33bc0461ee54e3baf0a9 diff --git a/qtdeclarative b/qtdeclarative index 4ee1462686d..3c075bfd348 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4ee1462686dc12eb463f5ba6b378d43a39aed074 +Subproject commit 3c075bfd348306cd553caddb9f8bf3f596666636 diff --git a/qtdoc b/qtdoc index 90ccf92b66b..cbd1102e264 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 90ccf92b66b7629a856a45a28947d0cb1699a386 +Subproject commit cbd1102e2649dfbe280f3b0d26a62278a8031540 diff --git a/qtqa b/qtqa index 39d778883e0..ed6d429996a 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 39d778883e0881dc97876a25a01711cfb6be6824 +Subproject commit ed6d429996a12b718aee0a5d6efe4e80be3afac9 diff --git a/qttools b/qttools index 02eed75d166..09db9653fac 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 02eed75d1661371fb76b496dfd08cbd198737b35 +Subproject commit 09db9653fac365821f56f4bf3db0e446180d2de0 diff --git a/qttranslations b/qttranslations index d6b52360ea3..b0237ea028e 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit d6b52360ea35afac259dc2875e012e8526873c4b +Subproject commit b0237ea028e4c95fe9f48315852595748c372939 diff --git a/qtwayland b/qtwayland index e5c272423d1..10005185e06 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e5c272423d1bba2825086b82fd97499237a6fa4b +Subproject commit 10005185e06857ce119c50fe710f9eedde06ec5e diff --git a/qtwebengine b/qtwebengine index 8f093f4f9cc..f5800f41752 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8f093f4f9cc48df82d639906a0a6d13231e0d6e0 +Subproject commit f5800f41752c566957e269f51fe4109f64c68f01 diff --git a/qtwebsockets b/qtwebsockets index 1a556baf525..d1e892816fb 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 1a556baf525ec5d6b03c40e890ee861da829a7b7 +Subproject commit d1e892816fba1494d9a63fc22a88d78c2bbe0429 From dc0c9cdff6f1f98a557b7937074f44ab131c1cb8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 1 Dec 2020 23:46:17 +0100 Subject: [PATCH 070/106] Update submodules on '5.15' in qt/qt5 Change-Id: Ia4c514497ce053b0e17fcd6a914857faea8b8254 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick3d | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index c5845d67be0..5de8f136ced 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c5845d67be03d0f1f538422ba1ad181442b09819 +Subproject commit 5de8f136cedee0fe4ad9f3caa31be8f7a06cb085 diff --git a/qtbase b/qtbase index 833214ee03f..fb984aaa1e8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 833214ee03f2d692a2eb33bc0461ee54e3baf0a9 +Subproject commit fb984aaa1e8933cbe08820b9adf51eab3f1825d0 diff --git a/qtmultimedia b/qtmultimedia index 5b4e84ed4b9..bd29c870276 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5b4e84ed4b93f849aa9367010ddb8c00c4030f6d +Subproject commit bd29c87027637a013f2c5e3b549fcda84e4d7545 diff --git a/qtqa b/qtqa index ed6d429996a..2913123a4b7 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit ed6d429996a12b718aee0a5d6efe4e80be3afac9 +Subproject commit 2913123a4b7d57bd4562f6d4817106bd108fa601 diff --git a/qtquick3d b/qtquick3d index 92873b57b9c..0a410c739d2 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 92873b57b9c342f9fbd86520f2b304967c64d96b +Subproject commit 0a410c739d27c918968aebd3c966d9cf2cb5528c diff --git a/qttools b/qttools index 09db9653fac..6c462cdcfc9 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 09db9653fac365821f56f4bf3db0e446180d2de0 +Subproject commit 6c462cdcfc9fcca9c060fce034c3e3507d8830b6 diff --git a/qttranslations b/qttranslations index b0237ea028e..70e7e9aee0a 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit b0237ea028e4c95fe9f48315852595748c372939 +Subproject commit 70e7e9aee0a46300b87c00d8427cf5d1e0015d21 diff --git a/qtwebengine b/qtwebengine index f5800f41752..97d8dc52b49 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f5800f41752c566957e269f51fe4109f64c68f01 +Subproject commit 97d8dc52b497c5202742280bfd2cf5fa54eb0302 From ffbb05cb802908993b0eb3fad05b13f94f41745b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 2 Dec 2020 23:46:14 +0100 Subject: [PATCH 071/106] Update submodules on '5.15' in qt/qt5 Change-Id: I34615557d90d3f2048c4210c998f0d196d06b0cb Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qttools | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index fb984aaa1e8..dbe6a65bb3a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fb984aaa1e8933cbe08820b9adf51eab3f1825d0 +Subproject commit dbe6a65bb3acda41f8c21b26550b23da41268abb diff --git a/qttools b/qttools index 6c462cdcfc9..33693a92898 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6c462cdcfc9fcca9c060fce034c3e3507d8830b6 +Subproject commit 33693a928986006d79c1ee743733cde5966ac402 diff --git a/qtwebengine b/qtwebengine index 97d8dc52b49..2dc642d3f97 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 97d8dc52b497c5202742280bfd2cf5fa54eb0302 +Subproject commit 2dc642d3f97bf457d7cf57265a35eb8b1bd83a8d From c9f70d8261a03959cbe3f8eb005e1e73ed60c152 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 6 Dec 2020 23:45:58 +0100 Subject: [PATCH 072/106] Update submodules on '5.15' in qt/qt5 Change-Id: I0836f0e04442d0292569addc548cdf586ae52ba9 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtsvg | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index dbe6a65bb3a..f35dd8ea143 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit dbe6a65bb3acda41f8c21b26550b23da41268abb +Subproject commit f35dd8ea143f251659f7bc96d12f1da5d76837b6 diff --git a/qtdeclarative b/qtdeclarative index 3c075bfd348..37c290c5b86 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3c075bfd348306cd553caddb9f8bf3f596666636 +Subproject commit 37c290c5b8659256ff574a06a3df2c363ae446b5 diff --git a/qtdoc b/qtdoc index cbd1102e264..941026dea53 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit cbd1102e2649dfbe280f3b0d26a62278a8031540 +Subproject commit 941026dea535f0cb29ef39f50430311080baa045 diff --git a/qtqa b/qtqa index 2913123a4b7..a674aa185fd 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 2913123a4b7d57bd4562f6d4817106bd108fa601 +Subproject commit a674aa185fd26ef078923014a181d47b43840419 diff --git a/qtsvg b/qtsvg index 9aac88424a1..aceea78cc05 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 9aac88424a1b76e0198b52437af58a6d94aff8e9 +Subproject commit aceea78cc05ac8ff947cee9de8149b48771781a8 diff --git a/qtwayland b/qtwayland index 10005185e06..dba4bc4f1d6 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 10005185e06857ce119c50fe710f9eedde06ec5e +Subproject commit dba4bc4f1d6dfee9fe9433c55b15653d703bed4f diff --git a/qtwebengine b/qtwebengine index 2dc642d3f97..b719da05c64 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2dc642d3f97bf457d7cf57265a35eb8b1bd83a8d +Subproject commit b719da05c6429d72f4e0e0af44da0bf3f3e57984 From 73fe0e7cf0628fb6b4f2c473c970021e66143774 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 30 Nov 2020 12:35:59 +0200 Subject: [PATCH 073/106] Provisioning: Install Azure tool MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-4042 Change-Id: I8e29190f4caf8b766cced40042bfe60ec2601a8e Reviewed-by: Tony Sarajärvi (cherry picked from commit cdea442a3a60421100e1bf80d8fa107995cda1ef) Reviewed-by: Qt Cherry-pick Bot --- .../common/windows/install-azure-tool.ps1 | 40 +++++++++++++++++++ .../91-install-azure-tool.ps1 | 1 + 2 files changed, 41 insertions(+) create mode 100644 coin/provisioning/common/windows/install-azure-tool.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 diff --git a/coin/provisioning/common/windows/install-azure-tool.ps1 b/coin/provisioning/common/windows/install-azure-tool.ps1 new file mode 100644 index 00000000000..937804fd63f --- /dev/null +++ b/coin/provisioning/common/windows/install-azure-tool.ps1 @@ -0,0 +1,40 @@ +############################################################################# +## +## Copyright (C) 2020 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# +. "$PSScriptRoot\helpers.ps1" + +# This script will install Azure singtool using Dotnet SDK +$dotnet = "C:\Program Files\dotnet\dotnet.exe" + +$version = "2.0.17" +Run-Executable "$dotnet" "tool install --global AzureSignTool --version $version" + diff --git a/coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 b/coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 new file mode 100644 index 00000000000..f1d5acc390e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/91-install-azure-tool.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-azure-tool.ps1" From 915cb775cec85a5d720646dc01fdd3ebaf34591a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 30 Nov 2020 12:09:48 +0200 Subject: [PATCH 074/106] Provisioning: Install Dotnet SDK 2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dotnet is needed for Azure installation Task-number: QTQAINFRA-4042 Change-Id: I6dd9d965f536d28554bbce6e76b19a3861f55ff2 Reviewed-by: Tony Sarajärvi (cherry picked from commit 8846d0d52d86940af6e57b495a5c20e08c7d47d0) Reviewed-by: Qt Cherry-pick Bot --- .../common/windows/install-dotnet.ps1 | 59 +++++++++++++++++++ .../90-install-dotnet.ps1 | 2 + 2 files changed, 61 insertions(+) create mode 100644 coin/provisioning/common/windows/install-dotnet.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 diff --git a/coin/provisioning/common/windows/install-dotnet.ps1 b/coin/provisioning/common/windows/install-dotnet.ps1 new file mode 100644 index 00000000000..8578c9b466b --- /dev/null +++ b/coin/provisioning/common/windows/install-dotnet.ps1 @@ -0,0 +1,59 @@ +############################################################################# +## +## Copyright (C) 2020 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# +. "$PSScriptRoot\helpers.ps1" + +# This script will install Dotnet SDK which is required for Azure installation + +$version = "2.1" +if (Is64BitWinHost) { + $urlCache = "http://ci-files01-hki.intra.qt.io/input/windows/dotnet-sdk-2.1.809-win-x64.exe" + $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/c980b6fb-e570-4c73-b344-e4dae6573777/f844ac1a4c6ea5de7227a701786126fd/dotnet-sdk-2.1.809-win-x64.exe" + $sha1 = "343e80c2ab558a30696dbe03ad2288bf435d5cd8" +} else { + $urlCache = "http://ci-files01-hki.intra.qt.io/input/windows/dotnet-sdk-2.1.809-win-x86.exe" + $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/cf86a2f3-f6b2-4959-8e41-cf84b0d2f294/a61e834f56abe2dc2e12599e1a60c10b/dotnet-sdk-2.1.809-win-x86.exe" + $sha1 = "b38a4e1392f17aed110508a1687f1c65b9d86161" +} +$installer = "C:\Windows\Temp\dotnet-sdk-$version.exe" + +Write-Host "Installing Dotnet SDK $version" +Download $urlOfficial $urlCache $installer +Verify-Checksum $installer $sha1 +Run-Executable "$installer" "/install /passive" +Prepend-Path "C:\Program Files\dotnet" +Remove $installer + +Write-Output "Dotnet SDK = $version" >> ~/versions.txt + + + diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 new file mode 100644 index 00000000000..a2ecfba2b81 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-dotnet.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-dotnet.ps1" + From 73472378162bf7d5e70de7a399c549504d472e89 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 11 Dec 2020 11:52:43 +0200 Subject: [PATCH 075/106] Provisioning: Add Nodejs12 to Path for RedHat Nodejs will not be installed under /opt/rh/devtoolset-4/ but instead under /opt/rh/rh-nodejs12 which means it needs to be added to PATH separately Change-Id: Ic7acbfaead866a89e03811ecdca2a7caf8476546 Reviewed-by: Allan Sandfeld Jensen --- .../qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh index 405d0492aa3..5d838575e4e 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh @@ -80,7 +80,7 @@ installPackages+=(pulseaudio-libs-devel) installPackages+=(libXtst-devel) installPackages+=(nspr-devel) installPackages+=(nss-devel) -installPackages+=(rh-nodejs12-nodejs) +installPackages+=(rh-nodejs12-nodejs) # NOTE! Nodejs12 needs to be added to PATH! installPackages+=(rh-nodejs12-nodejs-devel) # For Android builds installPackages+=(java-1.8.0-openjdk-devel) @@ -146,6 +146,7 @@ sudo /usr/local/bin/pip3 install wheel # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" +SetEnvVar "PATH" "/opt/rh/rh-nodejs12/root/usr/bin/node:\$PATH" gccVersion="$(gcc --version |grep gcc |cut -b 11-16)" echo "GCC = $gccVersion" >> versions.txt From 0a33a4152a232996288039b443df3b5afe78a7f2 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 11 Dec 2020 10:33:51 +0100 Subject: [PATCH 076/106] Add glproto-devel to openSUSE for webengine We now need glxtokens.h Change-Id: I55bc2d195cb27b53ff0a2573e558e4cd40e67451 Reviewed-by: Heikki Halmet (cherry picked from commit d5eeee1cd242d4571ca3a251cb5c681869c1e268) Reviewed-by: Allan Sandfeld Jensen --- .../qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh index d4fddd00c82..79a29837360 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh @@ -36,7 +36,7 @@ sudo zypper -nq install libicu-devel libicu60_2 # qtwebengine sudo zypper -nq install alsa-devel dbus-1-devel \ libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ - mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel + mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel glproto-devel # qtwebkit sudo zypper -nq install libxml2-devel libxslt-devel From 9610630e2be2a4b37cb89df935917c69ea45ed7f Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 10 Dec 2020 17:43:03 +0100 Subject: [PATCH 077/106] Fix nodejs installation on windows Was unpacked into a subdirectory with the same name as the archive Fixes: QTQAINFRA-4055 Change-Id: Ic11d2d926a1d2250b963010729d70bd00b992f89 Reviewed-by: Heikki Halmet (cherry picked from commit e38fc457409d0ddb96dbcb57cb4788e2640f4cab) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/windows/nodejs.ps1 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/coin/provisioning/common/windows/nodejs.ps1 b/coin/provisioning/common/windows/nodejs.ps1 index c56f6db6191..24b06751346 100644 --- a/coin/provisioning/common/windows/nodejs.ps1 +++ b/coin/provisioning/common/windows/nodejs.ps1 @@ -37,25 +37,25 @@ # Needed by QtWebengine $version = "12.18.0" -$package = "C:\Windows\temp\nodejs-$version.zip" -$targetFolder = "C:\Utils\nodejs" -$arch = "$((Get-WmiObject Win32_Processor).AddressWidth)" -$externalUrl = "https://nodejs.org/dist/v$version/node-v$version-win-x$arch.zip" -$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/node-v$version-win-x$arch.zip" - -if ( $arch -eq 64 ) { +if (Is64BitWinHost) { + $arch = "x64" $sha1 = "457b1527d249ee471a9445953a906cb10c75378d" } else { + $arch = "x86" $sha1 = "58801900f5bddca9c00feed6b84fed729426fc92" - } +$package = "C:\Windows\temp\nodejs-$version.zip" +$targetFolder = "C:\Utils" +$installFolder = "C:\Utils\node-v$version-win-$arch" +$externalUrl = "https://nodejs.org/dist/v$version/node-v$version-win-$arch.zip" +$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/node-v$version-win-$arch.zip" + Write-Host "Installing Node.js" Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 -mkdir $targetFolder Extract-7Zip $package $targetFolder -Add-Path $targetFolder +Add-Path $installFolder Remove $package Write-Output "Node.js = $version" >> ~/versions.txt From ec0fff7cbb7f2d3d905c31bb9dedafd3713c217f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 20 Dec 2020 23:45:52 +0100 Subject: [PATCH 078/106] Update submodules on '5.15' in qt/qt5 Change-Id: Ifdf51b8ea5f9ccc48f1db4314881c5a6f8c5cbdd Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 5de8f136ced..866d91a0b6c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 5de8f136cedee0fe4ad9f3caa31be8f7a06cb085 +Subproject commit 866d91a0b6cf35dbb074b4a7233f0b6b9be24f79 diff --git a/qtbase b/qtbase index f35dd8ea143..ffa0ecdc5d5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f35dd8ea143f251659f7bc96d12f1da5d76837b6 +Subproject commit ffa0ecdc5d507754ddd962e2edbc859c198b2700 diff --git a/qtdeclarative b/qtdeclarative index 37c290c5b86..1241e4f3c3e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 37c290c5b8659256ff574a06a3df2c363ae446b5 +Subproject commit 1241e4f3c3ec010ae121f5d56c3e9405ec43231f diff --git a/qtdoc b/qtdoc index 941026dea53..897e90fe304 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 941026dea535f0cb29ef39f50430311080baa045 +Subproject commit 897e90fe304d844beaf694b82a93a50237fa8b9e diff --git a/qtqa b/qtqa index a674aa185fd..36da1912a90 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit a674aa185fd26ef078923014a181d47b43840419 +Subproject commit 36da1912a90c0e3a91f59f96c984a7e43ab982b7 diff --git a/qtquick3d b/qtquick3d index 0a410c739d2..e8726958ace 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 0a410c739d27c918968aebd3c966d9cf2cb5528c +Subproject commit e8726958ace84be5db29b8323612111f89a63c2d diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 0c18cf4b245..2f0e9f98c6c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 0c18cf4b245aec7dd1652fd1effb155275e71064 +Subproject commit 2f0e9f98c6c6fdac09f762d41fddcc114f64b28a diff --git a/qtwayland b/qtwayland index dba4bc4f1d6..a8d35b3c18b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit dba4bc4f1d6dfee9fe9433c55b15653d703bed4f +Subproject commit a8d35b3c18bdb05a0da3ed50a554a7b7bd4ebed3 diff --git a/qtwebengine b/qtwebengine index b719da05c64..f328054d2ea 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b719da05c6429d72f4e0e0af44da0bf3f3e57984 +Subproject commit f328054d2eafc073b98a0246b2d644ee09c99d9c From bf9b9f9b988fca415edc26882eac06bdc9d66f70 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 18 Dec 2020 15:45:39 +0200 Subject: [PATCH 079/106] Update macOS 10.13 Tier1 image Software updates are disabled from tier1 image. It seems, that without this macOS 10.13 keep on crashing. This is related to QTQAINFRA-4104 Change-Id: I92f0039102d93268358301bfb789765ca39fd1ae Reviewed-by: Toni Saario (cherry picked from commit 9a0045045447bd34c7885b433a7fdfa66bde7ca1) Reviewed-by: Jani Heikkinen --- coin/platform_configs/default.yaml | 2 +- coin/platform_configs/qdb.yaml | 2 +- coin/platform_configs/qt5.yaml | 6 +++--- coin/platform_configs/tqtc-qt-config-gui.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 2a690178ca9..3a4c9eb3f96 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -81,7 +81,7 @@ Configurations: Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' Compiler: 'Clang' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml index c5bc7538ca5..7b4660a2f0d 100644 --- a/coin/platform_configs/qdb.yaml +++ b/coin/platform_configs/qdb.yaml @@ -18,7 +18,7 @@ Configurations: Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' Compiler: 'Clang' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index b359f966bd6..9d8eeeff9b9 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -48,7 +48,7 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' Target os: 'Android_ANY' Target arch: 'multi' Compiler: 'Clang' @@ -56,7 +56,7 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' Target os: 'QNX_700' Target arch: 'x86' Compiler: 'GCC' @@ -108,7 +108,7 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -platform win32-g++ -xplatform wasm-emscripten' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' Target os: 'WebAssembly' Compiler: 'Clang' Features: ['Packaging', 'DisableTests'] diff --git a/coin/platform_configs/tqtc-qt-config-gui.yaml b/coin/platform_configs/tqtc-qt-config-gui.yaml index 6c5d1d435ae..fb14fe15627 100644 --- a/coin/platform_configs/tqtc-qt-config-gui.yaml +++ b/coin/platform_configs/tqtc-qt-config-gui.yaml @@ -18,7 +18,7 @@ Configurations: Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu' - - Template: 'qtci-macos-10.13-x86_64-2' + Template: 'qtci-macos-10.13-x86_64-3' Compiler: 'Clang' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu' From 15e9dd1c7c299c9e780a015c39a0d172f8ef7bb2 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Sat, 19 Dec 2020 16:14:02 +0200 Subject: [PATCH 080/106] Change installation order in macOS 10.13 Nodejs installation fails with dependencies because symlinks already exists. Let's install homebrew and nodejs first before xz and python3. Also Opennebula installation needs to be before Nodejs installation, because brew will install another Openssl version as dependecy for nodejs and it can cause conflicts. Task-number: QTQAINFRA-4105 Change-Id: Ieea94eb118b5f2b71381ee24b8602e76813e35ea Reviewed-by: Jani Heikkinen --- .../qtci-macos-10.13-x86_64/{35-openssl.sh => 07-openssl-sh} | 0 .../qtci-macos-10.13-x86_64/{25-homebrew.sh => 08-homebrew.sh} | 0 .../qtci-macos-10.13-x86_64/{30-nodejs.sh => 08-nodejs.sh} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename coin/provisioning/qtci-macos-10.13-x86_64/{35-openssl.sh => 07-openssl-sh} (100%) rename coin/provisioning/qtci-macos-10.13-x86_64/{25-homebrew.sh => 08-homebrew.sh} (100%) rename coin/provisioning/qtci-macos-10.13-x86_64/{30-nodejs.sh => 08-nodejs.sh} (100%) diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.13-x86_64/07-openssl-sh similarity index 100% rename from coin/provisioning/qtci-macos-10.13-x86_64/35-openssl.sh rename to coin/provisioning/qtci-macos-10.13-x86_64/07-openssl-sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.13-x86_64/08-homebrew.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh rename to coin/provisioning/qtci-macos-10.13-x86_64/08-homebrew.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh b/coin/provisioning/qtci-macos-10.13-x86_64/08-nodejs.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh rename to coin/provisioning/qtci-macos-10.13-x86_64/08-nodejs.sh From 343e4a793c58e0ab58d8abed4ae75a35469b345a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 9 Dec 2020 13:53:18 +0200 Subject: [PATCH 081/106] Provisioning: Fix GCC installation for linux Pre-built package was missing from cache and source package was named as pre-built package Change-Id: I6d14b198ab7e3795e5f70986c9a50662225ac666 Reviewed-by: Samuli Piippo (cherry picked from commit 4aa14ea9d7ce4438f2891ddbaf34cea2bdcd559a) Reviewed-by: Toni Saario --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh index 573b30a928f..15142600b4c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh @@ -5,4 +5,4 @@ set -ex # shellcheck source=../common/linux/gcc.sh source "${BASH_SOURCE%/*}/../common/linux/gcc.sh" -InstallGCC 9.3.0 50 526bc0ed135e65366080350d0f991157752223c0 b746688bf045a316fc92c3528138ad10d0822b6b +InstallGCC 9.3.0 50 5038e8752407d14e5a70c8efc80c20a6d4219aaa 212f77d7b7fe1fdf01a1c0b0ebc9d82aeda5e1e0 From 8da32f0dc938fc721c8813002bf513bef4c0cca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 5 Nov 2020 09:09:37 +0000 Subject: [PATCH 082/106] Bring back the -no-gui build in the CI Task-number: QTQAINFRA-3999 Change-Id: I8e36d0b98c1d6062bf8bdf67eccba0727cb4bedc Reviewed-by: Qt CI Bot Reviewed-by: Heikki Halmet --- coin/platform_configs/default.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 3a4c9eb3f96..e1620b4cf2f 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -48,6 +48,11 @@ Configurations: Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-gui -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' From b815911d7a473741781375b652781d05a17fb901 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 16 Nov 2020 18:48:59 +0200 Subject: [PATCH 083/106] Update Windows 10 x86_64 version to 20H2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Windows 10 Enterprise 20H2, OS build 19042.508 Additional SW: MSVC 2019 version 16.8.1 MSVC 2019 Build Tools version 16.8.1 MSVC 2015 14.0.25420.1 Virtio driver Virtio Balloon driver NetKVM driver Vioserial driver Guest-agent qemu-ga-x86_64 Task-number: QTQAINFRA-3961 Change-Id: I8abc7ac011c58ad13db433fc86a1327afceafc68 Reviewed-by: Tony Sarajärvi (cherry picked from commit 420d7f809c2b133456b24d047e54e29936d0180b) --- coin/platform_configs/default.yaml | 12 ++--- coin/platform_configs/flashing-wizard.yaml | 4 +- coin/platform_configs/qdb.yaml | 4 +- coin/platform_configs/qt5.yaml | 20 +++---- coin/platform_configs/qtbase.yaml | 2 +- coin/platform_configs/qtconnectivity.yaml | 2 +- coin/platform_configs/qtsaferenderer.yaml | 4 +- coin/platform_configs/tqtc-qt-config-gui.yaml | 4 +- .../README_MANUAL_INSTALLATIONS | 26 ++++------ .../disable-windefender.ps1 | 14 +---- .../msvc2015_update.ps1 | 52 ------------------- .../msvc2015_update.txt | 18 +++++++ .../qtci-windows-10-x86_64/msvc2019.txt | 10 ++-- .../qtci-windows-10-x86_64/virtio.txt | 10 ++-- .../common/windows/disable-netadapterlso.ps1 | 2 +- .../05-update-msvc2019.ps1 | 1 - 16 files changed, 69 insertions(+), 116 deletions(-) delete mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/05-update-msvc2019.ps1 diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index e1620b4cf2f..4a3d06aa7c8 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,7 +1,7 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2015' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib' @@ -11,32 +11,32 @@ Configurations: Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target arch: 'x86' Compiler: 'MSVC2019' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qt-zlib' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2015' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Target arch: 'x86' Compiler: 'MSVC2015' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Target arch: 'armv7' Compiler: 'MSVC2015' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib' diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index 17e808785a0..25e71ccf76c 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -2,12 +2,12 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' Target arch: 'x86' Features: ['Packaging'] diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml index 7b4660a2f0d..0b16b11a433 100644 --- a/coin/platform_configs/qdb.yaml +++ b/coin/platform_configs/qdb.yaml @@ -2,13 +2,13 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2015' Target arch: 'x86' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86%' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2015' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64%' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 9d8eeeff9b9..fe4e5b9640f 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -1,13 +1,13 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Compiler: 'MSVC2015' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Target arch: 'x86' Compiler: 'MSVC2019' @@ -20,26 +20,26 @@ Configurations: Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Target arch: 'armv7' Compiler: 'MSVC2019' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-arm-msvc2019' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Compiler: 'MSVC2019' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-x64-msvc2019' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'Android_ANY' Target arch: 'multi' Compiler: 'Mingw' @@ -63,7 +63,7 @@ Configurations: Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'QNX_700' Target arch: 'armv7' Compiler: 'Mingw' @@ -71,7 +71,7 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'QNX_700' Target arch: 'armv8' Compiler: 'Mingw' @@ -79,7 +79,7 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'QNX_700' Target arch: 'x86_64' Compiler: 'Mingw' @@ -101,7 +101,7 @@ Configurations: Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WebAssembly' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 5cdca1c0ae3..8ad2a8b14ea 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -13,7 +13,7 @@ Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Target arch: 'x86_64' Compiler: 'MSVC2015' diff --git a/coin/platform_configs/qtconnectivity.yaml b/coin/platform_configs/qtconnectivity.yaml index f0b33ee445c..5e2d5c7e865 100644 --- a/coin/platform_configs/qtconnectivity.yaml +++ b/coin/platform_configs/qtconnectivity.yaml @@ -1,5 +1,5 @@ - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Target os: 'WinRT_10' Target arch: 'x86_64' Compiler: 'MSVC2015' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index f92b3ba25fc..e9c2be74836 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -1,12 +1,12 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Features: ['Packaging', 'DisableTests'] diff --git a/coin/platform_configs/tqtc-qt-config-gui.yaml b/coin/platform_configs/tqtc-qt-config-gui.yaml index fb14fe15627..073ef562f94 100644 --- a/coin/platform_configs/tqtc-qt-config-gui.yaml +++ b/coin/platform_configs/tqtc-qt-config-gui.yaml @@ -2,12 +2,12 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' - - Template: 'qtci-windows-10-x86_64-51' + Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' Target arch: 'x86' Features: ['Packaging'] diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS index ac6027631fd..0b0c89fdd31 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS @@ -1,12 +1,5 @@ # List about manual pre-installations to Tier1 image: -Virtual Hardware: -CPU: 4 -Memory: 8 GB -Hard Disk: 550 GB -CI_NW -Video Card - total memory: 32MB - VM Options: Boot options/Firmware: BIOS @@ -18,6 +11,14 @@ Windows 10 Enterprise Region: Finland Keyboard layout: United Kingdom +* Don't use online speech recognition +* Let Microsoft and apps use your location: no +* Find my devicer: no +* Send diagnostic data to Microsoft: Send required diagnostic data +* Imporve inking & typing: no +* Get tailored expreriences with diagnostic data: no +* Let apps use advertising ID: no + * VMware tools (complete) installed * Resolution set to 1280x800 * Coin-setup: @@ -45,12 +46,7 @@ Keyboard layout: United Kingdom * (Restart Windows) * Google Chrome installed for RTA * Virus & threat protection settings: - - Real-time protection -> off - - Cloud-delivered protection -> off - - Automatic sample submission -> off - - Tamper protection -> off -* Virus & threat protection notifications: - - Get informational notifications -> off - - Account protection notifications -> off + * Check that there's no active antivirus providers +* From 'Region Settings' + * Set Regional format: English (United States) * Activate Windows - diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 index 21938f7fb61..08dfb88e4a8 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1 @@ -1,6 +1,6 @@ ########################################################################### ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -44,18 +44,6 @@ Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F" Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableRoutinelyTakingAction /T REG_dWORD /D 1 /F" -# 'Windows Defender Cache Maintenance' - "Periodic maintenance task." -DisableSchedulerTask "Windows Defender\Windows Defender Cache Maintenance" - -# 'Windows Defender Cleanup' - "Periodic cleanup task." -DisableSchedulerTask "Windows Defender\Windows Defender Cleanup" - -# 'Windows Defender Scheduled Scan' - "Periodic scan task." -DisableSchedulerTask "Windows Defender\Windows Defender Scheduled Scan" - -# 'Windows Defender Verification' - "Periodic verification task." -DisableSchedulerTask "Windows Defender\Windows Defender Verification" - # Disable 'QueueReporting' - "Windows Error Reporting task to process queued reports." DisableSchedulerTask "Windows Error Reporting\QueueReporting" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 deleted file mode 100644 index 9ac8196e0ce..00000000000 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 +++ /dev/null @@ -1,52 +0,0 @@ -############################################################################# -## -## Copyright (C) 2018 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# Visual Studio $version was installed manually using $installer. -$version = "2015 update 3" -$version_number ="14.0.25420.1" -$installer = "en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978.exe" - -# default plus following components were selected: -# * Visual C++ -# - Common Tools for Visual C++ 2015 -# * Universal Windows App Development Tools -# - Tools (1.4.1) and Windows SDK (10.0.14393) -# - Windows 10 SDK (10.0.10586) -# - Windows 10 SDK (10.0.10240) -# * Common Tools -# -Visual Studio Extensibility Tools Update 3 - -# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer -$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe" - -echo "Visual Studio = $version version $version_number" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt new file mode 100644 index 00000000000..c4714602978 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt @@ -0,0 +1,18 @@ +# Visual Studio $version was installed manually using $installer. +$version = "2015 update 3" +$version_number ="14.0.25420.1" +$installer = "en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978.exe" + +# default plus following components were selected: +# * Programming Languages +# * Visual C++ +# - Common Tools for Visual C++ 2015 +# * Universal Windows App Development Tools +# - Tools (1.4.1) and Windows SDK (10.0.14393) +# - Windows 10 SDK (10.0.10586) +# - Windows 10 SDK (10.0.10240) +# * Common Tools +# -Visual Studio Extensibility Tools Update 3 + +# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer +$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe" diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt index e5fc9e93610..163621c543e 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt @@ -2,13 +2,13 @@ $version = "2019" # Current version was manually upgraded from the installer -$version_number = "16.6.2" +$version_number = "16.8.1" $installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe" MSVC 2019 build tools (default installation, no additional selections). * Install after MSVC2019 is installed! * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe" - * Version: 16.6.2 + * Version: 16.8.1 Installed MSVC-2019 Components: @@ -38,10 +38,10 @@ Text Template Transformation C# and Visual Basic Roslyn compilers C++ 2019 Redistributable Update C++ Cmake tools for Windows -C++/CLI support for v142 build tools /14.26) +C++/CLI support for v142 build tools /14.28) MSBuild MSVC v142 - VS 2019 C++ ARM build tools (v14.20) -MSVC v142 - VS 2019 C++ ARM build tools (v14.26) +MSVC v142 - VS 2019 C++ ARM build tools (v14.28) MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20) MSVC v142 - VS 2019 C++ ARM64 build tools (v14.26) MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20) @@ -57,7 +57,7 @@ Razor Language Services Graphics debugger and GPU profiler for DirectX Image and 3D model editors C++ ATL for latest v142 build tools (x86 & x64) -TypeScript 3.8 SDK +TypeScript 4.0 SDK Windows 10 SDK (10.0.16299.0) Windows 10 SDK (10.0.17134.0) Windows 10 SDK (10.0.17763.0) diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt b/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt index 4692e4a3c59..61c89933193 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt @@ -4,18 +4,22 @@ Our vanilla images are pre-installed in VMware where we have networking availabl use the VMware installed vmxnet3 NIC to fetch VirtIO drivers, install them, and only then switch to using the VirtIO NIC in KVM. -* Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win-0.1.171.iso -* Mount virtio-win-0.1.171.iso by double clicking it. +NOTE! Install these Virtio drivers in Opennebula when using Windows 10 20H2 +* Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.185-2/virtio-win-0.1.185.iso + cache: http://ci-files01-hki.ci.local/input/windows/virtio/virtio-win-0.1.185.iso +* Mount virtio-win-0.1.185.iso by double clicking it. * Right click 'E:\NetKVM\w10\amd64\netkvm.inf' and select Install * Right click 'E:\Balloon\w10\amd64\balloon.inf' and select Install - * Right click 'E:\vioscsi\w10\amd64\vioscsi.inf' and select Install +* Right click 'E:\vioserial\w10\amd64\vioser.inf' and select Install +* Navigate to E:\guest-agent directory and double click qemu-ga-x86_64 Because vioscsi does not install the entries in windows registry before we actually have a VirtIO device installed, and we can't boot with a VirtIO device before the driver is installed, we have to blindly install the registry entries: * Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg + cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/vioscsi.reg However, we've seen that the Owner in the registry can be wrong. This entry sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has diff --git a/coin/provisioning/common/windows/disable-netadapterlso.ps1 b/coin/provisioning/common/windows/disable-netadapterlso.ps1 index 36fff06e847..2df955b93b1 100644 --- a/coin/provisioning/common/windows/disable-netadapterlso.ps1 +++ b/coin/provisioning/common/windows/disable-netadapterlso.ps1 @@ -1,2 +1,2 @@ -Disable-NetAdapterLso Ethernet +Disable-NetAdapterLso "Ethernet 2" Start-Sleep -s 15 # Give windows some time to adjust network settings diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-update-msvc2019.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-update-msvc2019.ps1 deleted file mode 100644 index 3dc1439ab9f..00000000000 --- a/coin/provisioning/qtci-windows-10-x86_64/05-update-msvc2019.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\update-msvc2019.ps1" From 4d4a4649a9ec550cf8777c5cb7c5954b3335f026 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 29 Dec 2020 23:45:47 +0100 Subject: [PATCH 084/106] Update submodules on '5.15' in qt/qt5 Change-Id: I92945765f109c0710700191b7f0521a232749d39 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtdeclarative | 2 +- qtquick3d | 2 +- qtquicktimeline | 2 +- qttranslations | 2 +- qtwebsockets | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index 866d91a0b6c..077b1281ca3 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 866d91a0b6cf35dbb074b4a7233f0b6b9be24f79 +Subproject commit 077b1281ca376a39a5815b112e8e067cdc9165f4 diff --git a/qtdeclarative b/qtdeclarative index 1241e4f3c3e..35614462443 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1241e4f3c3ec010ae121f5d56c3e9405ec43231f +Subproject commit 35614462443c100b6753b335b58a134fed4b5c35 diff --git a/qtquick3d b/qtquick3d index e8726958ace..bb12dd2d62a 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit e8726958ace84be5db29b8323612111f89a63c2d +Subproject commit bb12dd2d62a274e51a29f705c3760f49395c16ef diff --git a/qtquicktimeline b/qtquicktimeline index 5e8b98101ca..67503cdadea 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 5e8b98101ca67873216954067ddcb3c10e53c30d +Subproject commit 67503cdadea43b95ddad0de1a04951aff0ce1a07 diff --git a/qttranslations b/qttranslations index 70e7e9aee0a..68f420ebdfb 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 70e7e9aee0a46300b87c00d8427cf5d1e0015d21 +Subproject commit 68f420ebdfb226e3d0c09ebed06d5454cc6c3a7f diff --git a/qtwebsockets b/qtwebsockets index d1e892816fb..e7883bc6444 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit d1e892816fba1494d9a63fc22a88d78c2bbe0429 +Subproject commit e7883bc64440b1ff4666272ac6eb710ee4bc221b From bac86c9fba094b0224a5feeead355f50bc826874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 15 Dec 2020 15:35:02 +0200 Subject: [PATCH 085/106] Provisioning: Fix installing nodejs and libusb to MacOS 10.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Brew doesn't provide pre built binaries of nodejs nor libusb for 10.13. Change-Id: I9e8b47dbbfde05fc38661df6c834b0ff3f2754f2 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/macos/libusb.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/08-nodejs.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/macos/libusb.sh b/coin/provisioning/common/macos/libusb.sh index cf9e7150c14..0022d209ecc 100755 --- a/coin/provisioning/common/macos/libusb.sh +++ b/coin/provisioning/common/macos/libusb.sh @@ -37,7 +37,7 @@ set -ex source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -brew install libusb +brew install --build-from-source libusb read -r -a arr <<< $(brew list --versions libusb) version=${arr[1]} echo "libusb = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/08-nodejs.sh b/coin/provisioning/qtci-macos-10.13-x86_64/08-nodejs.sh index ab99240518c..4600a8c25c7 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/08-nodejs.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/08-nodejs.sh @@ -2,5 +2,4 @@ set -ex -brew install nodejs - +brew install --build-from-source node From c5378f6cd63ee5743646937f94d57f035e59f844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 12 Aug 2020 13:32:29 +0300 Subject: [PATCH 086/106] Provisioning: Install libClang 10 with dynamic libs As Qt uses only static archives of libclang, we have to install dynamic version as an additional package. Libclang is required for example QtForPython. Change-Id: Ic9d70398113defe3561f261aee369b423c18686a Reviewed-by: Heikki Halmet (cherry picked from commit b792fd56dbf8d3ab1c8dd3d53b9afb86ca3555af) Reviewed-by: Qt Cherry-pick Bot --- .../common/unix/libclang-v100-dyn.sh | 83 +++++++++++++++++++ .../common/windows/libclang-v100-dyn.ps1 | 50 +++++++++++ .../05-libclang-v100-dyn.sh | 6 ++ .../08-libclang-v100-dyn.sh | 7 ++ .../04-libclang-v100-dyn.sh | 4 + .../08-libclang-v100-dyn.sh | 7 ++ .../28-libclang-v100-dyn.sh | 6 ++ .../08-libclang-v100-dyn.ps1 | 2 + 8 files changed, 165 insertions(+) create mode 100755 coin/provisioning/common/unix/libclang-v100-dyn.sh create mode 100644 coin/provisioning/common/windows/libclang-v100-dyn.ps1 create mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang-v100-dyn.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-libclang-v100-dyn.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-libclang-v100-dyn.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang-v100-dyn.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/28-libclang-v100-dyn.sh create mode 100644 coin/provisioning/qtci-windows-10-x86_64/08-libclang-v100-dyn.ps1 diff --git a/coin/provisioning/common/unix/libclang-v100-dyn.sh b/coin/provisioning/common/unix/libclang-v100-dyn.sh new file mode 100755 index 00000000000..d66094293ba --- /dev/null +++ b/coin/provisioning/common/unix/libclang-v100-dyn.sh @@ -0,0 +1,83 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). +# The Clang library (C-bindings), version 3.9 or higher is required for building. + +# This same script is used to provision libclang to Linux and macOS. +# In case of Linux, we expect to get the values as args +set -e + +# shellcheck source=./check_and_set_proxy.sh +source "${BASH_SOURCE%/*}/check_and_set_proxy.sh" +# shellcheck source=./SetEnvVar.sh +source "${BASH_SOURCE%/*}/SetEnvVar.sh" +# shellcheck source=./DownloadURL.sh +source "${BASH_SOURCE%/*}/DownloadURL.sh" + +libclang_version=10.0 + +if uname -a |grep -q Darwin; then + version=$libclang_version + url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$%7Bversion///%7D-based-mac.7z" + sha1="0fe1fa50b1b469d2c05acc3a3468bc93a66f1e5a" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_$%7Bversion///%7D-based-mac.7z" +elif test -f /etc/redhat-release || /etc/centos-release; then + version=$libclang_version + url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$%7Bversion///%7D-based-linux-Rhel7.6-gcc5.3-x86_64.7z" + sha1="1d2e265502fc0832a854f989d757105833fbd179" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_$%7Bversion///%7D-based-linux-Rhel7.6-gcc5.3-x86_64.7z" +else + version=$libclang_version + url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$%7Bversion///%7D-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z" + sha1="c1580acb3a82e193acf86f18afb52427c5e67de8" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_$%7Bversion///%7D-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z" +fi + +zip="/tmp/libclang.7z" +destination="/usr/local/libclang-dynlibs-$version" + +DownloadURL $url_cached $url $sha1 $zip +if command -v 7zr &> /dev/null; then + sudo 7zr x $zip -o/usr/local/ +else + sudo 7z x $zip -o/usr/local/ +fi +sudo mv /usr/local/libclang "$destination" +rm -rf $zip + + +echo "export LLVM_DYNAMIC_LIBS_100=$destination" >> ~/.bash_profile +echo "libClang for QtForPython= $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/libclang-v100-dyn.ps1 b/coin/provisioning/common/windows/libclang-v100-dyn.ps1 new file mode 100644 index 00000000000..b0792a07d6f --- /dev/null +++ b/coin/provisioning/common/windows/libclang-v100-dyn.ps1 @@ -0,0 +1,50 @@ +param( + [Int32]$archVer=32, + [string]$toolchain="vs2019", + [bool]$setDefault=$true +) +. "$PSScriptRoot\helpers.ps1" + +$libclang_version="10.0" +Write-Output "libClang for QtForPython = $libclang_version" >> ~/versions.txt + +# PySide versions following Qt6 use a C++ parser based on Clang (http://clang.org/). +# The Clang library (C-bindings), version 8.0 or higher is required for building. + +# Starting from Qt 5.11 QDoc requires Clang to parse C++ + +$baseDestination = "C:\Utils\libclang-" + $libclang_version + "-dynlibs-" + $toolchain +$libclang_version = $libclang_version -replace '["."]' + +function install() { + + param( + [string]$sha1=$1, + [string]$destination=$2 + ) + + $zip = "c:\users\qt\downloads\libclang-dyn.7z" + + $script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-based-windows-$toolchain%60_$archVer.7z" + $script:CachedUrl = "http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_$libclang_version-based-windows-$toolchain%60_$archVer.7z" + + Download $OfficialUrl $CachedUrl $zip + Verify-Checksum $zip $sha1 + Extract-7Zip $zip C:\Utils\ + Rename-Item C:\Utils\libclang $destination + Remove-Item -Force -Path $zip +} + +if ( $toolchain -eq "vs2019" ) { + if ( $archVer -eq 64 ) { + $sha1 = "B2C4F24B2388AEBAA6B8FCE3AE4E63D34D1517FE" + } + else { + $sha1 = "b970f51df255a27e0fdb7b665e70ed5281257f40" + } +} + +install $sha1 $baseDestination-$archVer + +Set-EnvironmentVariable "LLVM_DYNAMIC_LIBS_100" ($baseDestination + "-_ARCH_") + diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang-v100-dyn.sh new file mode 100755 index 00000000000..fbf34ddd38e --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang-v100-dyn.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang-v100-dyn.sh +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-libclang-v100-dyn.sh new file mode 100755 index 00000000000..b0080cbc9c4 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-libclang-v100-dyn.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang-v100-dyn.sh +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-libclang-v100-dyn.sh new file mode 100755 index 00000000000..dcd5b2d8cb2 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-libclang-v100-dyn.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang-v100-dyn.sh new file mode 100755 index 00000000000..b0080cbc9c4 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/08-libclang-v100-dyn.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang-v100-dyn.sh +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/28-libclang-v100-dyn.sh b/coin/provisioning/qtci-macos-10.14-x86_64/28-libclang-v100-dyn.sh new file mode 100755 index 00000000000..c9d6e93d0fa --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/28-libclang-v100-dyn.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-libclang-v100-dyn.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-libclang-v100-dyn.ps1 new file mode 100644 index 00000000000..82b912577d1 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/08-libclang-v100-dyn.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 64 vs2019 +. "$PSScriptRoot\..\common\windows\libclang-v100-dyn.ps1" 32 vs2019 From a27fe44a4ee7e0b27503c6beade5546cd81a9c66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 22 Dec 2020 12:32:23 +0200 Subject: [PATCH 087/106] Provisioning: Remove deprecated brew call Change-Id: If956d0f77cd5c6763fc2314277c346d8f27e6eee Reviewed-by: Heikki Halmet (cherry picked from commit 0350263a07b49532623110e2aa5cf64ea3165246) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/macos/macos-version.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/coin/provisioning/common/macos/macos-version.sh b/coin/provisioning/common/macos/macos-version.sh index 9f357b8cb50..c88cd9b8207 100755 --- a/coin/provisioning/common/macos/macos-version.sh +++ b/coin/provisioning/common/macos/macos-version.sh @@ -44,8 +44,6 @@ sw_vers >> ~/versions.txt echo "***** All installed packages *****" >> ~/versions.txt echo "***** HomeBrew *****" >> ~/versions.txt brew list --versions >> ~/versions.txt -echo "***** HomeBrew Casks*****" >> ~/versions.txt -brew cask list --versions >> ~/versions.txt echo "***** Apple's installer *****" >> ~/versions.txt pkgutil --pkgs >> ~/versions.txt echo "*********************************************" >> ~/versions.txt From 6cafc374865cf051cdda62b21323cd1e375f64ef Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 31 Dec 2020 23:45:44 +0100 Subject: [PATCH 088/106] Update submodules on '5.15' in qt/qt5 Change-Id: Ica19534090a17021ed9738ef8f86fed6453cfc1c Reviewed-by: Qt Submodule Update Bot --- qtquick3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtquick3d b/qtquick3d index bb12dd2d62a..de162f30e8f 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit bb12dd2d62a274e51a29f705c3760f49395c16ef +Subproject commit de162f30e8fd23b5fa45ffef0752aab8540129f3 From 88c2d05f5d4706bb16ff4146b4979f2c8608140e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 23 Dec 2020 11:36:21 +0200 Subject: [PATCH 089/106] Provisioning: Install Nodejs version 10 for QtWebengine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-4057 Change-Id: I6f476db59ee8fdb13d37a22fdd878c3db1fd1594 Reviewed-by: Tony Sarajärvi --- .../qtci-linux-SLES-15-x86_64/02-enable-modules.sh | 8 ++++++++ .../qtci-linux-SLES-15-x86_64/02-zypperpackages.sh | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 coin/provisioning/qtci-linux-SLES-15-x86_64/02-enable-modules.sh diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-enable-modules.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-enable-modules.sh new file mode 100644 index 00000000000..52c67941b4e --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-enable-modules.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -ex + +# Activate these modules + +# This is needed by Nodejs and QtWebEngine +sudo SUSEConnect -p sle-module-web-scripting/15/x86_64 diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh index a366e80721c..bed165f157d 100755 --- a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh @@ -109,6 +109,9 @@ sudo zypper -nq install java # open-vm-tools requires update. Version in tier1 is broken and causes segfault on boot. sudo zypper -nq update open-vm-tools +# Nodejs - needed by QtWebEngine +sudo zypper -nq install nodejs10 +sudo zypper -nq install nodejs10-devel + gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" echo "GCC = $gccVersion" >> versions.txt - From 0c6aa06e0ccaad29eab5163828acb1bca27853e9 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 14 Dec 2020 09:15:15 +0100 Subject: [PATCH 090/106] Provisioning: Fix Nodejs12 Path for RedHat The path included the executable by accident. Change-Id: If477914a7313987796a952a05e9eecba7fdaf9c2 Reviewed-by: Heikki Halmet --- .../qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh index 5d838575e4e..5e3a4f8cbac 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh @@ -146,7 +146,7 @@ sudo /usr/local/bin/pip3 install wheel # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" -SetEnvVar "PATH" "/opt/rh/rh-nodejs12/root/usr/bin/node:\$PATH" +SetEnvVar "PATH" "/opt/rh/rh-nodejs12/root/usr/bin:\$PATH" gccVersion="$(gcc --version |grep gcc |cut -b 11-16)" echo "GCC = $gccVersion" >> versions.txt From f68f1a89f3e295fb5e2f27651d663eee8ecf8daf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 4 Jan 2021 10:28:46 +0200 Subject: [PATCH 091/106] Provisioning: Fix dynamic libclang libs install Cherry-pick from dev branch introduced unnecessary file but also missed two configurations. This change amends c5378f6cd63ee5743646937f94d57f035e59f844 Change-Id: I42bf3cabcd39b4acf8db623a08f52e06f06a6562 Reviewed-by: Heikki Halmet --- .../08-libclang-v100-dyn.sh | 0 .../qtci-macos-10.13-x86_64/28-libclang-v100-dyn.sh | 6 ++++++ 2 files changed, 6 insertions(+) rename coin/provisioning/{qtci-linux-SLES-15_SP2-x86_64 => qtci-linux-RHEL-7.6-x86_64}/08-libclang-v100-dyn.sh (100%) create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/28-libclang-v100-dyn.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/08-libclang-v100-dyn.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/08-libclang-v100-dyn.sh rename to coin/provisioning/qtci-linux-RHEL-7.6-x86_64/08-libclang-v100-dyn.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/28-libclang-v100-dyn.sh b/coin/provisioning/qtci-macos-10.13-x86_64/28-libclang-v100-dyn.sh new file mode 100755 index 00000000000..c9d6e93d0fa --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/28-libclang-v100-dyn.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" From b78a4dc89344bd3069f75496b5978500ed124828 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Wed, 2 Mar 2022 18:04:45 +0200 Subject: [PATCH 092/106] Merge Qt 5.15.3 Opensource release Merge of the v5.15.3-lts-lgpl tag. Change-Id: I87eabbc5d9e960e2afb74574c603067480d0468f --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index 077b1281ca3..cd8f66a15ed 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 077b1281ca376a39a5815b112e8e067cdc9165f4 +Subproject commit cd8f66a15ed63ea80ca66ebe30f1a3fe75fb29eb diff --git a/qtactiveqt b/qtactiveqt index f0d03da0e37..2c53a16f431 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit f0d03da0e37a84029a4eae1733813521482ac1fb +Subproject commit 2c53a16f431bbb950bfca8ac32ddabf217a0bf04 diff --git a/qtandroidextras b/qtandroidextras index 8cce1098c59..1939eada1cd 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 8cce1098c59534352aa0f343ea73861f603ac04a +Subproject commit 1939eada1cdf00052bba32657d9d975c1e255128 diff --git a/qtbase b/qtbase index ffa0ecdc5d5..c8989ca20fa 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ffa0ecdc5d507754ddd962e2edbc859c198b2700 +Subproject commit c8989ca20fa5798f7853f07df6e150cc407c64a4 diff --git a/qtcharts b/qtcharts index 130463160b4..f13988aa1ad 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 130463160b4923069eb98da49edaf7d93180f4f8 +Subproject commit f13988aa1ad9de5d92e7b0ba4d0d947dd019d759 diff --git a/qtconnectivity b/qtconnectivity index 69a87a9b831..4dcb2f232e0 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 69a87a9b831e36a578594a0a13130c384ad03121 +Subproject commit 4dcb2f232e00836830dcbffdc5dafbcde6607c08 diff --git a/qtdatavis3d b/qtdatavis3d index c085311c02d..19af9584f7b 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit c085311c02dd216e5a041b90c164d55b3cf3ce92 +Subproject commit 19af9584f7b80928ee49950c573c770af68c9519 diff --git a/qtdeclarative b/qtdeclarative index 35614462443..4bb06cfba94 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 35614462443c100b6753b335b58a134fed4b5c35 +Subproject commit 4bb06cfba94bcc9ddf30d968a227d00479d475b7 diff --git a/qtdoc b/qtdoc index 897e90fe304..6ca6c8fc164 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 897e90fe304d844beaf694b82a93a50237fa8b9e +Subproject commit 6ca6c8fc1641dd78868215cf2e08ad8eff40c5c2 diff --git a/qtgamepad b/qtgamepad index 64afa18a0a1..6b7a6303439 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 64afa18a0a1e9588060e2e6d917bb01ccdd48a81 +Subproject commit 6b7a6303439f83147680723f4d8142d676cdb928 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index c36998dc158..37957792576 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit c36998dc1581167b12cc3de8e4ac68c2a5d9f76e +Subproject commit 379577925766385991f413a2b0d0d46831381ffa diff --git a/qtimageformats b/qtimageformats index cb82c743108..90038c93676 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit cb82c74310837fe4e832c8ab72176a5d63e4355f +Subproject commit 90038c936763645610fe1e5f05cfc025e4d98631 diff --git a/qtlocation b/qtlocation index 861e372b6ad..1bf01b84e30 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 861e372b6ad81570d4f496e42fb25a6699b72f2f +Subproject commit 1bf01b84e30aab2b87a19184ce42160e6c92d8b1 diff --git a/qtlottie b/qtlottie index fa8c8bfc674..fca3f80f0ce 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit fa8c8bfc6742ab98b61d1351e054e0e73e9a42f4 +Subproject commit fca3f80f0ce389271e5bd9af864ce56a313d359a diff --git a/qtmacextras b/qtmacextras index e7289696869..80bc8d86508 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit e72896968697e2a8af16a312e1560948e4c40f30 +Subproject commit 80bc8d86508579c7a57110c09a44e33f9d8bc0e5 diff --git a/qtmultimedia b/qtmultimedia index bd29c870276..fa6c3d65368 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit bd29c87027637a013f2c5e3b549fcda84e4d7545 +Subproject commit fa6c3d653682f9fd331d859c7196a291a8a4d8d5 diff --git a/qtnetworkauth b/qtnetworkauth index 53870ee9bb9..958db00a206 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 53870ee9bb9117702cd1f11cb1c5d1cfc2d5394a +Subproject commit 958db00a2064f77b354b573102ca2c2b2e07529c diff --git a/qtpurchasing b/qtpurchasing index cbf444fb570..255b9e16f28 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit cbf444fb570ca4f4ca21d963d2ae4010f10d473e +Subproject commit 255b9e16f286003bbfaff9d48e4548fb0cb3b398 diff --git a/qtquick3d b/qtquick3d index de162f30e8f..be8b69e3dc7 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit de162f30e8fd23b5fa45ffef0752aab8540129f3 +Subproject commit be8b69e3dc7177a18a055f13db7925b7eea64346 diff --git a/qtquickcontrols b/qtquickcontrols index cf3f6d7fec8..d054de15b3c 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit cf3f6d7fec824cdf01f9b329ab3b92b1c0e0a420 +Subproject commit d054de15b3c9ead0f96655ddfb1a6381ed7a0e2b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index a2593ff9cf5..453e302ea51 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit a2593ff9cf5d0af885c20c2e9f9faa6ca4f1c1a3 +Subproject commit 453e302ea51a9f628ccb1382e812b09f259f890b diff --git a/qtquicktimeline b/qtquicktimeline index 67503cdadea..98b1ff53458 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 67503cdadea43b95ddad0de1a04951aff0ce1a07 +Subproject commit 98b1ff53458887061b4bcc183efcce899f432394 diff --git a/qtremoteobjects b/qtremoteobjects index 4d6d1e35fb8..581475dfeb4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 4d6d1e35fb8e0cb900b5e5e9266edea51dc4f735 +Subproject commit 581475dfeb44c8b51c0be86e0f2f57df7d117a80 diff --git a/qtscxml b/qtscxml index 7a15000f42c..50d2da3965e 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 7a15000f42c7a3171719727cd056f82a78244ed7 +Subproject commit 50d2da3965ed8e85f3f5f5760393c42b12d34a9f diff --git a/qtsensors b/qtsensors index 921a31375f2..975ba788d3d 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 921a31375f29e429e95352b08b2b9dbfea663cb1 +Subproject commit 975ba788d3d0ee87aa08bb5301cd33dcbf00521b diff --git a/qtserialbus b/qtserialbus index 8884c5e43df..22b3cad1932 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 8884c5e43df846deac5a0c7c290eeb633d6bfe32 +Subproject commit 22b3cad193232ab379a0c9e16989a7db1fdc9234 diff --git a/qtserialport b/qtserialport index 941d1d8560d..f95e2411d7c 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 941d1d8560d1f3e40077c251fbde6fd6a5b0f0d4 +Subproject commit f95e2411d7c978def87846ea7cedf3dc5fd7c8b8 diff --git a/qtspeech b/qtspeech index a0efc38377e..19cc9922d64 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit a0efc38377e5bf7eed2d354d1cb4d7a0d5dc7e1b +Subproject commit 19cc9922d641405759689b2139bb47bc9ca034c3 diff --git a/qtsvg b/qtsvg index aceea78cc05..b4dfef869ab 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit aceea78cc05ac8ff947cee9de8149b48771781a8 +Subproject commit b4dfef869ab1ff25c8b511d52371d8b7a18d6902 diff --git a/qttools b/qttools index 33693a92898..36831ae7426 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 33693a928986006d79c1ee743733cde5966ac402 +Subproject commit 36831ae742619e13db32ee6048d851bddee28a74 diff --git a/qttranslations b/qttranslations index 68f420ebdfb..dd60182834f 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 68f420ebdfb226e3d0c09ebed06d5454cc6c3a7f +Subproject commit dd60182834fe92f42aad46dad6afb090387461a2 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 2f0e9f98c6c..6468f8ae72c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 2f0e9f98c6c6fdac09f762d41fddcc114f64b28a +Subproject commit 6468f8ae72c5ecb72710ad1a3a651028d8e9d8d9 diff --git a/qtwayland b/qtwayland index a8d35b3c18b..f4dd0560032 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a8d35b3c18bdb05a0da3ed50a554a7b7bd4ebed3 +Subproject commit f4dd0560032c101fe9fd140ccc2397f5c0184146 diff --git a/qtwebchannel b/qtwebchannel index 47be9a51b01..2ff82955f2d 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 47be9a51b01d9fd9e7f6dca81e98d4eedcec6d38 +Subproject commit 2ff82955f2db732064b8ad7dbb81bda6017ef30c diff --git a/qtwebglplugin b/qtwebglplugin index 550a8cee241..4318ad91c2a 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 550a8cee241bbf8c11863dec9587d579dcb1108b +Subproject commit 4318ad91c2a8bea3a0aaaa64aaf49d3b997e50a1 diff --git a/qtwebsockets b/qtwebsockets index e7883bc6444..bc41f7daab7 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit e7883bc64440b1ff4666272ac6eb710ee4bc221b +Subproject commit bc41f7daab7ea84ff6eabaf5ae5229a5b285ee8f diff --git a/qtwebview b/qtwebview index 920de5f1cd9..ec4de0cec22 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 920de5f1cd9f9001cfef1bfd2c19e6720793362f +Subproject commit ec4de0cec2299f4ae0228ea2c71011e0520ca40e diff --git a/qtwinextras b/qtwinextras index 3df03dab21f..051202df9c5 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 3df03dab21f3e84d5a7274c64dd879854ca1bfe7 +Subproject commit 051202df9c553d7c0a384f07bd67fde98f3b02c4 diff --git a/qtx11extras b/qtx11extras index 3898f5484fd..f628d7a60e4 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 3898f5484fd4864b047729bfeda9a1222f32364f +Subproject commit f628d7a60e45d90a439cb0a393a6229ac6892be5 diff --git a/qtxmlpatterns b/qtxmlpatterns index 189e28d0aff..af4958af9d6 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 189e28d0aff1f3d7960228ba318b83e3cadac98c +Subproject commit af4958af9d628d6124e64abd9743abce42f15a6f From 45624b631fffebe4d2cd1a28978c37304bea8d3c Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Mon, 9 May 2022 19:30:14 +0300 Subject: [PATCH 093/106] Merge Qt 5.15.4 release to the public 5.15 branch Merge the Qt 5.15.4 release that is tagged with the v5.15.4-lts-lgpl tag. Change-Id: I6564af2fd851f5cebe88781153da53979244ca50 --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index cd8f66a15ed..d2d93cc3bf9 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit cd8f66a15ed63ea80ca66ebe30f1a3fe75fb29eb +Subproject commit d2d93cc3bf911f82431bdc5908219add8291a6f8 diff --git a/qtactiveqt b/qtactiveqt index 2c53a16f431..065ae50f6bf 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2c53a16f431bbb950bfca8ac32ddabf217a0bf04 +Subproject commit 065ae50f6bf947f11b7bcaa3199df99a83667574 diff --git a/qtandroidextras b/qtandroidextras index 1939eada1cd..3eed66304b5 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 1939eada1cdf00052bba32657d9d975c1e255128 +Subproject commit 3eed66304b557509446631908fc53afaed4e0958 diff --git a/qtbase b/qtbase index c8989ca20fa..ffdd372c7bb 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c8989ca20fa5798f7853f07df6e150cc407c64a4 +Subproject commit ffdd372c7bbda62e9d937f406319f38e3e982774 diff --git a/qtcharts b/qtcharts index f13988aa1ad..16c2a882113 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit f13988aa1ad9de5d92e7b0ba4d0d947dd019d759 +Subproject commit 16c2a8821135bf89369c4e3c5a1bdff8b05ffdb5 diff --git a/qtconnectivity b/qtconnectivity index 4dcb2f232e0..83ca3a24715 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 4dcb2f232e00836830dcbffdc5dafbcde6607c08 +Subproject commit 83ca3a2471560f09d723157322adc0b5c33ed914 diff --git a/qtdatavis3d b/qtdatavis3d index 19af9584f7b..5f8e2a037d5 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 19af9584f7b80928ee49950c573c770af68c9519 +Subproject commit 5f8e2a037d5201c902149c828d102b71e90257e2 diff --git a/qtdeclarative b/qtdeclarative index 4bb06cfba94..04ea6df18a2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4bb06cfba94bcc9ddf30d968a227d00479d475b7 +Subproject commit 04ea6df18a2b06efd133a4f1b13c2e38817279ae diff --git a/qtdoc b/qtdoc index 6ca6c8fc164..e891d509efc 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 6ca6c8fc1641dd78868215cf2e08ad8eff40c5c2 +Subproject commit e891d509efcb49a90615cb0ce775680d5eab10a3 diff --git a/qtgamepad b/qtgamepad index 6b7a6303439..8526b210146 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 6b7a6303439f83147680723f4d8142d676cdb928 +Subproject commit 8526b210146a2d030ae2f55ad44261befea4a087 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 37957792576..4c6ec38635a 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 379577925766385991f413a2b0d0d46831381ffa +Subproject commit 4c6ec38635aa22cf0854df8e710733c529f4ec02 diff --git a/qtimageformats b/qtimageformats index 90038c93676..8c5bcabbf6a 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 90038c936763645610fe1e5f05cfc025e4d98631 +Subproject commit 8c5bcabbf6a2e27539c2ad689fd69f2406d5cf5c diff --git a/qtlocation b/qtlocation index 1bf01b84e30..c4d3a00345e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 1bf01b84e30aab2b87a19184ce42160e6c92d8b1 +Subproject commit c4d3a00345e99cfc2e137d457c89d979f9e0c348 diff --git a/qtlottie b/qtlottie index fca3f80f0ce..ccba2b00bd7 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit fca3f80f0ce389271e5bd9af864ce56a313d359a +Subproject commit ccba2b00bd7f10558edb8664d6b9a95e9fafe6ac diff --git a/qtmacextras b/qtmacextras index 80bc8d86508..45e8529401b 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 80bc8d86508579c7a57110c09a44e33f9d8bc0e5 +Subproject commit 45e8529401b7ac9128d6dbddb8c769530d0f047c diff --git a/qtmultimedia b/qtmultimedia index fa6c3d65368..dc0ee181d4c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit fa6c3d653682f9fd331d859c7196a291a8a4d8d5 +Subproject commit dc0ee181d4c56ff66c989bd3292dad7cc35e234b diff --git a/qtnetworkauth b/qtnetworkauth index 958db00a206..2b0c9499e40 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 958db00a2064f77b354b573102ca2c2b2e07529c +Subproject commit 2b0c9499e4000858138802e8f5aa28aa2ebe14c0 diff --git a/qtpurchasing b/qtpurchasing index 255b9e16f28..397c7218470 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 255b9e16f286003bbfaff9d48e4548fb0cb3b398 +Subproject commit 397c721847059b998d3b345149a3f6113579d7fe diff --git a/qtquick3d b/qtquick3d index be8b69e3dc7..c8f225c4d61 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit be8b69e3dc7177a18a055f13db7925b7eea64346 +Subproject commit c8f225c4d61b1fd3afa048db93f2e2294896a36f diff --git a/qtquickcontrols b/qtquickcontrols index d054de15b3c..d405bf6a29b 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d054de15b3c9ead0f96655ddfb1a6381ed7a0e2b +Subproject commit d405bf6a29bc9d6da6e3dcefbd1b88f5ed70fb1b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 453e302ea51..69c1a1e86b9 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 453e302ea51a9f628ccb1382e812b09f259f890b +Subproject commit 69c1a1e86b9774fbee6958021055c899151e1955 diff --git a/qtquicktimeline b/qtquicktimeline index 98b1ff53458..2ce816fa582 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 98b1ff53458887061b4bcc183efcce899f432394 +Subproject commit 2ce816fa5822bcc1c47678447405b2e5dc1312c1 diff --git a/qtremoteobjects b/qtremoteobjects index 581475dfeb4..809412e1cc2 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 581475dfeb44c8b51c0be86e0f2f57df7d117a80 +Subproject commit 809412e1cc2151c21f843796ef67705600f6aafb diff --git a/qtscxml b/qtscxml index 50d2da3965e..dcbd73cf3e8 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 50d2da3965ed8e85f3f5f5760393c42b12d34a9f +Subproject commit dcbd73cf3e8a07dbfa249d7db2257caafa83781b diff --git a/qtsensors b/qtsensors index 975ba788d3d..1ab8d6c7257 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 975ba788d3d0ee87aa08bb5301cd33dcbf00521b +Subproject commit 1ab8d6c7257f9ec060739b648704be1cf1c16b05 diff --git a/qtserialbus b/qtserialbus index 22b3cad1932..e34053fbda8 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 22b3cad193232ab379a0c9e16989a7db1fdc9234 +Subproject commit e34053fbda8d687e3dc294fbd5e3a88bf94a7a66 diff --git a/qtserialport b/qtserialport index f95e2411d7c..191e67e4285 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f95e2411d7c978def87846ea7cedf3dc5fd7c8b8 +Subproject commit 191e67e428522a0e2e1e8d2f3440607a9760d441 diff --git a/qtspeech b/qtspeech index 19cc9922d64..89ddde42bed 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 19cc9922d641405759689b2139bb47bc9ca034c3 +Subproject commit 89ddde42bedc02b950ba4d8fd75ae6064576622b diff --git a/qtsvg b/qtsvg index b4dfef869ab..945a9f19f9a 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit b4dfef869ab1ff25c8b511d52371d8b7a18d6902 +Subproject commit 945a9f19f9a018ffb6b9bb8396186df448e519d7 diff --git a/qttools b/qttools index 36831ae7426..53ee43a51b5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 36831ae742619e13db32ee6048d851bddee28a74 +Subproject commit 53ee43a51b5a3de2877dafffc78e71ff55926708 diff --git a/qttranslations b/qttranslations index dd60182834f..df1ee9bf818 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit dd60182834fe92f42aad46dad6afb090387461a2 +Subproject commit df1ee9bf81899303c1380173e24b0973dbd31265 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 6468f8ae72c..16b4ce79b2a 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 6468f8ae72c5ecb72710ad1a3a651028d8e9d8d9 +Subproject commit 16b4ce79b2a337e6f7dd8985879e982f620e160b diff --git a/qtwayland b/qtwayland index f4dd0560032..193420c09f8 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f4dd0560032c101fe9fd140ccc2397f5c0184146 +Subproject commit 193420c09f8539da9fba141b05d6c6ae5b6a4760 diff --git a/qtwebchannel b/qtwebchannel index 2ff82955f2d..486fbe67fbc 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 2ff82955f2db732064b8ad7dbb81bda6017ef30c +Subproject commit 486fbe67fbce65cd4d605fb57fad518366299414 diff --git a/qtwebglplugin b/qtwebglplugin index 4318ad91c2a..df60c61e640 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 4318ad91c2a8bea3a0aaaa64aaf49d3b997e50a1 +Subproject commit df60c61e640dc4fb6be0d9565a4ab08aee054f93 diff --git a/qtwebsockets b/qtwebsockets index bc41f7daab7..373947b7803 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit bc41f7daab7ea84ff6eabaf5ae5229a5b285ee8f +Subproject commit 373947b7803ac61dfb02b6d355bc2b60f310d2cf diff --git a/qtwebview b/qtwebview index ec4de0cec22..826d2a33929 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit ec4de0cec2299f4ae0228ea2c71011e0520ca40e +Subproject commit 826d2a33929c69807917536d48b7861e7682001e diff --git a/qtwinextras b/qtwinextras index 051202df9c5..96cfbd36ad9 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 051202df9c553d7c0a384f07bd67fde98f3b02c4 +Subproject commit 96cfbd36ad9979ff1974cf137b68b9ae101022c3 diff --git a/qtx11extras b/qtx11extras index f628d7a60e4..51b0a5a2e3e 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit f628d7a60e45d90a439cb0a393a6229ac6892be5 +Subproject commit 51b0a5a2e3e35f4cb17da1e7cb4babef6294bfb4 diff --git a/qtxmlpatterns b/qtxmlpatterns index af4958af9d6..dfcae10dec8 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit af4958af9d628d6124e64abd9743abce42f15a6f +Subproject commit dfcae10dec8c1c2c544ad0cd303cea113b0af51d From 9039ca53a3dac14415cea435083bb96f0acdb3d8 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Thu, 16 Jun 2022 22:31:38 +0300 Subject: [PATCH 094/106] Merge Qt 5.15.5 opensource release Change-Id: Ibf0dfbd2eeb20674380382a87876d44062f2b67f --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index d2d93cc3bf9..e1b9039ca87 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d2d93cc3bf911f82431bdc5908219add8291a6f8 +Subproject commit e1b9039ca879ab3714a3f67301378f43334e4b1d diff --git a/qtactiveqt b/qtactiveqt index 065ae50f6bf..a4211b21b09 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 065ae50f6bf947f11b7bcaa3199df99a83667574 +Subproject commit a4211b21b09a1b98020522bc058e0ee2d6ed2e1d diff --git a/qtandroidextras b/qtandroidextras index 3eed66304b5..45ce7b075b5 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 3eed66304b557509446631908fc53afaed4e0958 +Subproject commit 45ce7b075b5dd19744b9446aa9e8ceb1d099d8b9 diff --git a/qtbase b/qtbase index ffdd372c7bb..231d3670981 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ffdd372c7bbda62e9d937f406319f38e3e982774 +Subproject commit 231d3670981a33ec42b91ad1cb33c1fc50551066 diff --git a/qtcharts b/qtcharts index 16c2a882113..68f09a30471 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 16c2a8821135bf89369c4e3c5a1bdff8b05ffdb5 +Subproject commit 68f09a304711b2874985227bd78f782a9b67def9 diff --git a/qtconnectivity b/qtconnectivity index 83ca3a24715..15f809f2a7f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 83ca3a2471560f09d723157322adc0b5c33ed914 +Subproject commit 15f809f2a7f555c2bdb8ac152bd187e313a2838c diff --git a/qtdatavis3d b/qtdatavis3d index 5f8e2a037d5..a32c95d2722 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 5f8e2a037d5201c902149c828d102b71e90257e2 +Subproject commit a32c95d27224c6c9e41d6080ea54bc937c5d1455 diff --git a/qtdeclarative b/qtdeclarative index 04ea6df18a2..ae66ecf0f95 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 04ea6df18a2b06efd133a4f1b13c2e38817279ae +Subproject commit ae66ecf0f95c79d730190b92e641c0410d5d6896 diff --git a/qtdoc b/qtdoc index e891d509efc..5634ec444b5 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e891d509efcb49a90615cb0ce775680d5eab10a3 +Subproject commit 5634ec444b57e4a84fb87d70d6f3a70a6677a133 diff --git a/qtgamepad b/qtgamepad index 8526b210146..5107ddf2817 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 8526b210146a2d030ae2f55ad44261befea4a087 +Subproject commit 5107ddf28177112cdbf505f92bb4191a91e6521a diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 4c6ec38635a..c25898224cd 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 4c6ec38635aa22cf0854df8e710733c529f4ec02 +Subproject commit c25898224cd957491d10dbe48f2f0be66f2955de diff --git a/qtimageformats b/qtimageformats index 8c5bcabbf6a..425808b1876 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 8c5bcabbf6a2e27539c2ad689fd69f2406d5cf5c +Subproject commit 425808b1876d9ab5bf7d83a74277770d2bdb1ef2 diff --git a/qtlocation b/qtlocation index c4d3a00345e..ddf3f881563 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c4d3a00345e99cfc2e137d457c89d979f9e0c348 +Subproject commit ddf3f88156369671576a9bcc703feb22e7b7ff0d diff --git a/qtlottie b/qtlottie index ccba2b00bd7..4b3d1e824fd 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit ccba2b00bd7f10558edb8664d6b9a95e9fafe6ac +Subproject commit 4b3d1e824fdde2c835041464a9f85feaed0b313d diff --git a/qtmacextras b/qtmacextras index 45e8529401b..166cb4d6166 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 45e8529401b7ac9128d6dbddb8c769530d0f047c +Subproject commit 166cb4d6166cab60a66a074c848f6ed725e6755c diff --git a/qtmultimedia b/qtmultimedia index dc0ee181d4c..bd43269bd7b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit dc0ee181d4c56ff66c989bd3292dad7cc35e234b +Subproject commit bd43269bd7bcea644a11989e5a97339a698c8e6c diff --git a/qtnetworkauth b/qtnetworkauth index 2b0c9499e40..9e698881cb0 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 2b0c9499e4000858138802e8f5aa28aa2ebe14c0 +Subproject commit 9e698881cb07ebf04319f5cfa7b065c8bc2c1afb diff --git a/qtpurchasing b/qtpurchasing index 397c7218470..87021fd1e50 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 397c721847059b998d3b345149a3f6113579d7fe +Subproject commit 87021fd1e50f0aa3589a2412cfa665a6d27cc740 diff --git a/qtquick3d b/qtquick3d index c8f225c4d61..d8345b03d80 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit c8f225c4d61b1fd3afa048db93f2e2294896a36f +Subproject commit d8345b03d800ff30781f32ed04dcf74758f8869b diff --git a/qtquickcontrols b/qtquickcontrols index d405bf6a29b..4fb4e5942bf 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d405bf6a29bc9d6da6e3dcefbd1b88f5ed70fb1b +Subproject commit 4fb4e5942bfa1f92f1c759f182aa504ad52e8e3b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 69c1a1e86b9..a970e15d728 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 69c1a1e86b9774fbee6958021055c899151e1955 +Subproject commit a970e15d7281d2d13485a486c6debadf46ed7950 diff --git a/qtquicktimeline b/qtquicktimeline index 2ce816fa582..2da3c0efd50 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 2ce816fa5822bcc1c47678447405b2e5dc1312c1 +Subproject commit 2da3c0efd5016bdba26b80789773238c2886fdf6 diff --git a/qtremoteobjects b/qtremoteobjects index 809412e1cc2..89407ff20e4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 809412e1cc2151c21f843796ef67705600f6aafb +Subproject commit 89407ff20e4f76314887e2f3625f5126910031ac diff --git a/qtscxml b/qtscxml index dcbd73cf3e8..bb5d10f926c 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit dcbd73cf3e8a07dbfa249d7db2257caafa83781b +Subproject commit bb5d10f926c51aa462a56ffb331afd4f9607855c diff --git a/qtsensors b/qtsensors index 1ab8d6c7257..bce4b623122 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 1ab8d6c7257f9ec060739b648704be1cf1c16b05 +Subproject commit bce4b6231229e953c3961f3d9858e58555a55d56 diff --git a/qtserialbus b/qtserialbus index e34053fbda8..b6e22f07fb5 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit e34053fbda8d687e3dc294fbd5e3a88bf94a7a66 +Subproject commit b6e22f07fb529736c9362d81de7f5c632bd1f439 diff --git a/qtserialport b/qtserialport index 191e67e4285..112fcd80658 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 191e67e428522a0e2e1e8d2f3440607a9760d441 +Subproject commit 112fcd80658a52e6a2822ec79a7d724d0ad003cf diff --git a/qtspeech b/qtspeech index 89ddde42bed..dabefb96b50 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 89ddde42bedc02b950ba4d8fd75ae6064576622b +Subproject commit dabefb96b50480587ff8fcca2026920e1eec0e1a diff --git a/qtsvg b/qtsvg index 945a9f19f9a..4f625ebfa7c 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 945a9f19f9a018ffb6b9bb8396186df448e519d7 +Subproject commit 4f625ebfa7cb63c865141e50ff1877fca1e94142 diff --git a/qttools b/qttools index 53ee43a51b5..6583391282b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 53ee43a51b5a3de2877dafffc78e71ff55926708 +Subproject commit 6583391282b02d0866975c224852b868a83be01a diff --git a/qttranslations b/qttranslations index df1ee9bf818..0ad0de0063a 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit df1ee9bf81899303c1380173e24b0973dbd31265 +Subproject commit 0ad0de0063a36f71a56d342abefd839106639069 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 16b4ce79b2a..1dfbdd2fc87 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 16b4ce79b2a337e6f7dd8985879e982f620e160b +Subproject commit 1dfbdd2fc87b2be860efc97e809c92f21fb20ae2 diff --git a/qtwayland b/qtwayland index 193420c09f8..f2c225598c9 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 193420c09f8539da9fba141b05d6c6ae5b6a4760 +Subproject commit f2c225598c98f3f3e489fdcbd09c61e14d540f9b diff --git a/qtwebchannel b/qtwebchannel index 486fbe67fbc..e93b140e38f 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 486fbe67fbce65cd4d605fb57fad518366299414 +Subproject commit e93b140e38fa66540c83fbed1b297e17ddc255fc diff --git a/qtwebglplugin b/qtwebglplugin index df60c61e640..8feafc4b8e9 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit df60c61e640dc4fb6be0d9565a4ab08aee054f93 +Subproject commit 8feafc4b8e9af78175e2814523ef4f11e445fc93 diff --git a/qtwebsockets b/qtwebsockets index 373947b7803..4255e66eee5 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 373947b7803ac61dfb02b6d355bc2b60f310d2cf +Subproject commit 4255e66eee580a244a693172289ef1ab6a8452c8 diff --git a/qtwebview b/qtwebview index 826d2a33929..429096eb954 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 826d2a33929c69807917536d48b7861e7682001e +Subproject commit 429096eb954672d3727a3e8cc83832bc79cf7967 diff --git a/qtwinextras b/qtwinextras index 96cfbd36ad9..b41efc2b32a 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 96cfbd36ad9979ff1974cf137b68b9ae101022c3 +Subproject commit b41efc2b32a19da9fe369e243dcf3a2a31f7cde6 diff --git a/qtx11extras b/qtx11extras index 51b0a5a2e3e..0dfaf36ec6f 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 51b0a5a2e3e35f4cb17da1e7cb4babef6294bfb4 +Subproject commit 0dfaf36ec6f642a0fd583ce1cc33a31eb6b3328e diff --git a/qtxmlpatterns b/qtxmlpatterns index dfcae10dec8..a8edba5ad50 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit dfcae10dec8c1c2c544ad0cd303cea113b0af51d +Subproject commit a8edba5ad50d669aead4ddb769f171cba892d676 From 6e27fd5679a4c373eaf8056909a9f3b7ae2ccb8a Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Wed, 7 Sep 2022 13:47:25 +0300 Subject: [PATCH 095/106] Release Qt 5.15.6 opensource Releasing Qt 5.15.6 opensource to the public 5.15 branch. Change-Id: I4c7b5b3a692b6f25e32523f6a7c76f53d230e1b7 --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index e1b9039ca87..a537b1e4e0b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e1b9039ca879ab3714a3f67301378f43334e4b1d +Subproject commit a537b1e4e0b9821850ddf77ef1f2178df8de3d43 diff --git a/qtactiveqt b/qtactiveqt index a4211b21b09..ccc9a61d104 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit a4211b21b09a1b98020522bc058e0ee2d6ed2e1d +Subproject commit ccc9a61d10404a4999dec61fdb513aa50f265cc3 diff --git a/qtandroidextras b/qtandroidextras index 45ce7b075b5..1d9324ce38c 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 45ce7b075b5dd19744b9446aa9e8ceb1d099d8b9 +Subproject commit 1d9324ce38ce5100d827942eda67fe634753655b diff --git a/qtbase b/qtbase index 231d3670981..a5984e05938 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 231d3670981a33ec42b91ad1cb33c1fc50551066 +Subproject commit a5984e059385e93ab06eb95cbe12bea5215f7b9d diff --git a/qtcharts b/qtcharts index 68f09a30471..841083c263f 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 68f09a304711b2874985227bd78f782a9b67def9 +Subproject commit 841083c263f16f8acb81e4915bf24bbed0461c9a diff --git a/qtconnectivity b/qtconnectivity index 15f809f2a7f..41cd6185fff 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 15f809f2a7f555c2bdb8ac152bd187e313a2838c +Subproject commit 41cd6185fff015f492820ec8d6be99690e562791 diff --git a/qtdatavis3d b/qtdatavis3d index a32c95d2722..502612c72a2 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit a32c95d27224c6c9e41d6080ea54bc937c5d1455 +Subproject commit 502612c72a2cd3b3b0c4cff926e7764d74106d33 diff --git a/qtdeclarative b/qtdeclarative index ae66ecf0f95..f274d775774 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ae66ecf0f95c79d730190b92e641c0410d5d6896 +Subproject commit f274d775774b78f6217c9770ae87045d969acbe1 diff --git a/qtdoc b/qtdoc index 5634ec444b5..b803e8795e2 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5634ec444b57e4a84fb87d70d6f3a70a6677a133 +Subproject commit b803e8795e2d320cb1cd59036d0a3b93107eaad7 diff --git a/qtgamepad b/qtgamepad index 5107ddf2817..0a2d4651362 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 5107ddf28177112cdbf505f92bb4191a91e6521a +Subproject commit 0a2d4651362810600d2ff7272772d5908bb8714b diff --git a/qtgraphicaleffects b/qtgraphicaleffects index c25898224cd..e6e1e58ec28 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit c25898224cd957491d10dbe48f2f0be66f2955de +Subproject commit e6e1e58ec28fd0f2e6426e6962cc4ccddb493349 diff --git a/qtimageformats b/qtimageformats index 425808b1876..3c316057a0e 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 425808b1876d9ab5bf7d83a74277770d2bdb1ef2 +Subproject commit 3c316057a0e6dae324f92a3bef2c31c398c2ea51 diff --git a/qtlocation b/qtlocation index ddf3f881563..261b146c5c9 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit ddf3f88156369671576a9bcc703feb22e7b7ff0d +Subproject commit 261b146c5c9dd51c2a88837342b2fe605b3a3c78 diff --git a/qtlottie b/qtlottie index 4b3d1e824fd..d40b67401af 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 4b3d1e824fdde2c835041464a9f85feaed0b313d +Subproject commit d40b67401afe7156b03c62c9a4d517b07555fe64 diff --git a/qtmacextras b/qtmacextras index 166cb4d6166..c9bf2516187 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 166cb4d6166cab60a66a074c848f6ed725e6755c +Subproject commit c9bf2516187331033f0860976497eab0828cf25e diff --git a/qtmultimedia b/qtmultimedia index bd43269bd7b..34420b12f69 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit bd43269bd7bcea644a11989e5a97339a698c8e6c +Subproject commit 34420b12f697484b1cd59e5091a0cc4c7d90e2bc diff --git a/qtnetworkauth b/qtnetworkauth index 9e698881cb0..01315e31c51 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 9e698881cb07ebf04319f5cfa7b065c8bc2c1afb +Subproject commit 01315e31c5164c896a524175854c4b6df17fe166 diff --git a/qtpurchasing b/qtpurchasing index 87021fd1e50..fa07915d5b7 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 87021fd1e50f0aa3589a2412cfa665a6d27cc740 +Subproject commit fa07915d5b7c5ba16f2e8ba32a9066fe7eed0cb1 diff --git a/qtquick3d b/qtquick3d index d8345b03d80..0132a99b2be 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit d8345b03d800ff30781f32ed04dcf74758f8869b +Subproject commit 0132a99b2bee388b4d0c7365a380bca39e83af3b diff --git a/qtquickcontrols b/qtquickcontrols index 4fb4e5942bf..e62b8b6d2f4 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4fb4e5942bfa1f92f1c759f182aa504ad52e8e3b +Subproject commit e62b8b6d2f45a79652238b33f4bbe23023004ae7 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index a970e15d728..bbd4a25e456 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit a970e15d7281d2d13485a486c6debadf46ed7950 +Subproject commit bbd4a25e456a2922ff71d9cbe9a8b7f656e753ad diff --git a/qtquicktimeline b/qtquicktimeline index 2da3c0efd50..87ad61716a7 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 2da3c0efd5016bdba26b80789773238c2886fdf6 +Subproject commit 87ad61716a7cba5a070d8a7b1756c8b2b48d5d53 diff --git a/qtremoteobjects b/qtremoteobjects index 89407ff20e4..aa705010da0 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 89407ff20e4f76314887e2f3625f5126910031ac +Subproject commit aa705010da0f658b78c1155babce7091ae44529a diff --git a/qtscxml b/qtscxml index bb5d10f926c..631fd7bcc34 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit bb5d10f926c51aa462a56ffb331afd4f9607855c +Subproject commit 631fd7bcc34802b7650c2b1dc73691463954d982 diff --git a/qtsensors b/qtsensors index bce4b623122..35eb5ac7eae 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit bce4b6231229e953c3961f3d9858e58555a55d56 +Subproject commit 35eb5ac7eaef4745a38958c3ca780d7baa2e4f30 diff --git a/qtserialbus b/qtserialbus index b6e22f07fb5..f9f7eee60ad 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit b6e22f07fb529736c9362d81de7f5c632bd1f439 +Subproject commit f9f7eee60adac72fcf6617d164e3bf61222bb5c5 diff --git a/qtserialport b/qtserialport index 112fcd80658..c9abfcd5d88 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 112fcd80658a52e6a2822ec79a7d724d0ad003cf +Subproject commit c9abfcd5d88cb43c2a7c1d5ddecbff4cdd320694 diff --git a/qtspeech b/qtspeech index dabefb96b50..7287488a412 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit dabefb96b50480587ff8fcca2026920e1eec0e1a +Subproject commit 7287488a4123c2563592a3b33460fef9600dafd8 diff --git a/qtsvg b/qtsvg index 4f625ebfa7c..58a0c41ecbb 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 4f625ebfa7cb63c865141e50ff1877fca1e94142 +Subproject commit 58a0c41ecbb808be0135e0ceec4ad990cd2e88f4 diff --git a/qttools b/qttools index 6583391282b..b52467bcbea 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6583391282b02d0866975c224852b868a83be01a +Subproject commit b52467bcbea35b81a1f4dcc14cd1870db2981a2e diff --git a/qttranslations b/qttranslations index 0ad0de0063a..d7c7ee9ffc2 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 0ad0de0063a36f71a56d342abefd839106639069 +Subproject commit d7c7ee9ffc2033fa2c4112df9663222e95b22b5f diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 1dfbdd2fc87..f05d6542fe9 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 1dfbdd2fc87b2be860efc97e809c92f21fb20ae2 +Subproject commit f05d6542fe994ddf58df2b68c9fba4f1269bd91f diff --git a/qtwayland b/qtwayland index f2c225598c9..96f7165dd12 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f2c225598c98f3f3e489fdcbd09c61e14d540f9b +Subproject commit 96f7165dd1200ca63330dd44660d309e761fd522 diff --git a/qtwebchannel b/qtwebchannel index e93b140e38f..ca9f6dfd39d 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit e93b140e38fa66540c83fbed1b297e17ddc255fc +Subproject commit ca9f6dfd39d4c44c2c13a9026c9c7ac6de214555 diff --git a/qtwebglplugin b/qtwebglplugin index 8feafc4b8e9..68a322c391c 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 8feafc4b8e9af78175e2814523ef4f11e445fc93 +Subproject commit 68a322c391c2eb92876fce42b9fc23ad2f3a1ecb diff --git a/qtwebsockets b/qtwebsockets index 4255e66eee5..72027f3a453 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 4255e66eee580a244a693172289ef1ab6a8452c8 +Subproject commit 72027f3a4532787d3bc5ae6ef56b055b3a1a5e09 diff --git a/qtwebview b/qtwebview index 429096eb954..87577dde04e 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 429096eb954672d3727a3e8cc83832bc79cf7967 +Subproject commit 87577dde04ed219bda776dabca86176149736331 diff --git a/qtwinextras b/qtwinextras index b41efc2b32a..a2ef397d183 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit b41efc2b32a19da9fe369e243dcf3a2a31f7cde6 +Subproject commit a2ef397d1833c7417138a14ae23c880ae434d8a6 diff --git a/qtx11extras b/qtx11extras index 0dfaf36ec6f..982f20eb585 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 0dfaf36ec6f642a0fd583ce1cc33a31eb6b3328e +Subproject commit 982f20eb585d77e5b5c721e05a466d7161f7f2d1 diff --git a/qtxmlpatterns b/qtxmlpatterns index a8edba5ad50..30e6c84fe27 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit a8edba5ad50d669aead4ddb769f171cba892d676 +Subproject commit 30e6c84fe2752cde8b53aff9d38c2095cd7c8761 From 95254e52c658729e80f741324045034c15ce9cb0 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Thu, 27 Oct 2022 15:19:00 +0300 Subject: [PATCH 096/106] Merge Qt 5.15.7 opensource release Change-Id: If618dd6e51b8144be8373d7ccc0518a05dbc8cd5 --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index a537b1e4e0b..fa7cb071928 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a537b1e4e0b9821850ddf77ef1f2178df8de3d43 +Subproject commit fa7cb071928c9603bb0c5a0f1958dd4a7c045340 diff --git a/qtactiveqt b/qtactiveqt index ccc9a61d104..80b43bfe410 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit ccc9a61d10404a4999dec61fdb513aa50f265cc3 +Subproject commit 80b43bfe4109820fb7feddb4a16e227a03bc1c4e diff --git a/qtandroidextras b/qtandroidextras index 1d9324ce38c..3f8c9f144ac 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 1d9324ce38ce5100d827942eda67fe634753655b +Subproject commit 3f8c9f144acbe921a759d261e1314614793f89e0 diff --git a/qtbase b/qtbase index a5984e05938..ab28ff2207e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a5984e059385e93ab06eb95cbe12bea5215f7b9d +Subproject commit ab28ff2207e8f33754c79793089dbf943d67736d diff --git a/qtcharts b/qtcharts index 841083c263f..055c6d6e49c 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 841083c263f16f8acb81e4915bf24bbed0461c9a +Subproject commit 055c6d6e49c5ea369990e7078fd534392a0ba6b9 diff --git a/qtconnectivity b/qtconnectivity index 41cd6185fff..47c424c7990 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 41cd6185fff015f492820ec8d6be99690e562791 +Subproject commit 47c424c7990061714bd3108e3fbaa4339ba411b9 diff --git a/qtdatavis3d b/qtdatavis3d index 502612c72a2..8e1a57efa1b 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 502612c72a2cd3b3b0c4cff926e7764d74106d33 +Subproject commit 8e1a57efa1ba3eabbf44098ce6ede3d130c57b5d diff --git a/qtdeclarative b/qtdeclarative index f274d775774..da0aac10575 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f274d775774b78f6217c9770ae87045d969acbe1 +Subproject commit da0aac1057552048f59075beb31861a6cc076684 diff --git a/qtdoc b/qtdoc index b803e8795e2..6521ffa081d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b803e8795e2d320cb1cd59036d0a3b93107eaad7 +Subproject commit 6521ffa081dca635b7bf9a47da18df5eac2d2d89 diff --git a/qtgamepad b/qtgamepad index 0a2d4651362..ce0202d67bf 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 0a2d4651362810600d2ff7272772d5908bb8714b +Subproject commit ce0202d67bf1ab2bb887f58122b20eab5b6c1d5d diff --git a/qtgraphicaleffects b/qtgraphicaleffects index e6e1e58ec28..a2b1600300c 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit e6e1e58ec28fd0f2e6426e6962cc4ccddb493349 +Subproject commit a2b1600300cda89804d48ec90e0068a075fecc8b diff --git a/qtimageformats b/qtimageformats index 3c316057a0e..7824fe51318 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 3c316057a0e6dae324f92a3bef2c31c398c2ea51 +Subproject commit 7824fe51318b8a87caa9ef3ed4db99914e22e6e4 diff --git a/qtlocation b/qtlocation index 261b146c5c9..597c98851d8 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 261b146c5c9dd51c2a88837342b2fe605b3a3c78 +Subproject commit 597c98851d85a5f1f03abfaaf8c91a33a963d9f0 diff --git a/qtlottie b/qtlottie index d40b67401af..8bb9237e4e1 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit d40b67401afe7156b03c62c9a4d517b07555fe64 +Subproject commit 8bb9237e4e1462f405d931a8a513ed4c27632d9e diff --git a/qtmacextras b/qtmacextras index c9bf2516187..e7d4c378109 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit c9bf2516187331033f0860976497eab0828cf25e +Subproject commit e7d4c37810976b6a1730d842cbca04b66ca7de30 diff --git a/qtmultimedia b/qtmultimedia index 34420b12f69..981ed7e4ecf 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 34420b12f697484b1cd59e5091a0cc4c7d90e2bc +Subproject commit 981ed7e4ecfcc27cbe9c0492b31f89386335155c diff --git a/qtnetworkauth b/qtnetworkauth index 01315e31c51..f34ac77b595 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 01315e31c5164c896a524175854c4b6df17fe166 +Subproject commit f34ac77b5955126be60faa2b801be2d19dff896f diff --git a/qtpurchasing b/qtpurchasing index fa07915d5b7..25ead89b083 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit fa07915d5b7c5ba16f2e8ba32a9066fe7eed0cb1 +Subproject commit 25ead89b0834f669e0a193e6d6cf2da25d33a452 diff --git a/qtquick3d b/qtquick3d index 0132a99b2be..1d1420cd7e4 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 0132a99b2bee388b4d0c7365a380bca39e83af3b +Subproject commit 1d1420cd7e49dd588b8986952c0bcd6b7e6b83cb diff --git a/qtquickcontrols b/qtquickcontrols index e62b8b6d2f4..c7dae5f6041 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit e62b8b6d2f45a79652238b33f4bbe23023004ae7 +Subproject commit c7dae5f6041d6c076311f2d8ed13fcfe3598be70 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index bbd4a25e456..5b169fcfcb1 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit bbd4a25e456a2922ff71d9cbe9a8b7f656e753ad +Subproject commit 5b169fcfcb123c5a129ba63133dd27c56675a479 diff --git a/qtquicktimeline b/qtquicktimeline index 87ad61716a7..e2438e010a9 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 87ad61716a7cba5a070d8a7b1756c8b2b48d5d53 +Subproject commit e2438e010a98d731317c10a64c095e0282b51ab0 diff --git a/qtremoteobjects b/qtremoteobjects index aa705010da0..5f2a598a913 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit aa705010da0f658b78c1155babce7091ae44529a +Subproject commit 5f2a598a9134167a0da2efcbf1249fc167ae3750 diff --git a/qtscxml b/qtscxml index 631fd7bcc34..e1faea1db52 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 631fd7bcc34802b7650c2b1dc73691463954d982 +Subproject commit e1faea1db52b91d90ef64dd57eb6529e323b5526 diff --git a/qtsensors b/qtsensors index 35eb5ac7eae..5f1f73fdba8 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 35eb5ac7eaef4745a38958c3ca780d7baa2e4f30 +Subproject commit 5f1f73fdba8906f58c4554cbef9c1a72edcf0230 diff --git a/qtserialbus b/qtserialbus index f9f7eee60ad..180cb13048a 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit f9f7eee60adac72fcf6617d164e3bf61222bb5c5 +Subproject commit 180cb13048a24510f9a1b20796772d27da762bdd diff --git a/qtserialport b/qtserialport index c9abfcd5d88..966cf2a2077 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit c9abfcd5d88cb43c2a7c1d5ddecbff4cdd320694 +Subproject commit 966cf2a2077a8470715894363ad46ea7df0665fa diff --git a/qtspeech b/qtspeech index 7287488a412..b598a509f5c 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 7287488a4123c2563592a3b33460fef9600dafd8 +Subproject commit b598a509f5cfb78090ecea74d43182482d719fce diff --git a/qtsvg b/qtsvg index 58a0c41ecbb..ea8154f37ca 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 58a0c41ecbb808be0135e0ceec4ad990cd2e88f4 +Subproject commit ea8154f37ca56b6b9951e2581ea1dda5cc060e57 diff --git a/qttools b/qttools index b52467bcbea..7a197fadc9a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b52467bcbea35b81a1f4dcc14cd1870db2981a2e +Subproject commit 7a197fadc9af18a446a5de8f026b298ce343e923 diff --git a/qttranslations b/qttranslations index d7c7ee9ffc2..c38edd3a550 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit d7c7ee9ffc2033fa2c4112df9663222e95b22b5f +Subproject commit c38edd3a5501bcd53132e1e4abb7d25a98e0e1a9 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index f05d6542fe9..8aebadb96c1 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit f05d6542fe994ddf58df2b68c9fba4f1269bd91f +Subproject commit 8aebadb96c1e57ba89bba2e5962399f676207a32 diff --git a/qtwayland b/qtwayland index 96f7165dd12..2ce7b8d2c53 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 96f7165dd1200ca63330dd44660d309e761fd522 +Subproject commit 2ce7b8d2c5355d91642256d9260222d211cc368c diff --git a/qtwebchannel b/qtwebchannel index ca9f6dfd39d..309144f77a5 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit ca9f6dfd39d4c44c2c13a9026c9c7ac6de214555 +Subproject commit 309144f77a568e31b1b916a3b7c9c587fe54ea2c diff --git a/qtwebglplugin b/qtwebglplugin index 68a322c391c..3087cdd0758 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 68a322c391c2eb92876fce42b9fc23ad2f3a1ecb +Subproject commit 3087cdd0758258163299602550f7d4e72edf2a80 diff --git a/qtwebsockets b/qtwebsockets index 72027f3a453..66509bb4542 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 72027f3a4532787d3bc5ae6ef56b055b3a1a5e09 +Subproject commit 66509bb4542e654b6cc5dcd90c160f1cd222ead7 diff --git a/qtwebview b/qtwebview index 87577dde04e..b1605fea61a 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 87577dde04ed219bda776dabca86176149736331 +Subproject commit b1605fea61a6bbb599b720c54282bc8ddb0aacf0 diff --git a/qtwinextras b/qtwinextras index a2ef397d183..2a04b162451 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit a2ef397d1833c7417138a14ae23c880ae434d8a6 +Subproject commit 2a04b162451460ffc208c2c27acce16a18f763ce diff --git a/qtx11extras b/qtx11extras index 982f20eb585..9134cdba938 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 982f20eb585d77e5b5c721e05a466d7161f7f2d1 +Subproject commit 9134cdba9386e408ce2ffe515ca0c3f6f6c66685 diff --git a/qtxmlpatterns b/qtxmlpatterns index 30e6c84fe27..b798a0f0265 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 30e6c84fe2752cde8b53aff9d38c2095cd7c8761 +Subproject commit b798a0f0265538a9dd12b5c7e4dad84ba8e1db4e From 3c61a77b7f2a2df6077290843ab13069bd70dca9 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Tue, 3 Jan 2023 19:38:49 +0200 Subject: [PATCH 097/106] Merge Qt 5.15.8 opensource release Change-Id: I94326f4288b4f8ed013a1f24a27d593aae4ef86e --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index fa7cb071928..c3c7e6ebc29 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit fa7cb071928c9603bb0c5a0f1958dd4a7c045340 +Subproject commit c3c7e6ebc29cce466d954f72f340a257d76b5ec2 diff --git a/qtactiveqt b/qtactiveqt index 80b43bfe410..2334cafc110 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 80b43bfe4109820fb7feddb4a16e227a03bc1c4e +Subproject commit 2334cafc110c4e63bec3a5c7abdcd67e5e5ee754 diff --git a/qtandroidextras b/qtandroidextras index 3f8c9f144ac..7ede0a6c555 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 3f8c9f144acbe921a759d261e1314614793f89e0 +Subproject commit 7ede0a6c555518a3fecba8930d5e4d9c58875d0d diff --git a/qtbase b/qtbase index ab28ff2207e..4ee4fc18b40 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ab28ff2207e8f33754c79793089dbf943d67736d +Subproject commit 4ee4fc18b4067b90efa46ca9baba74f53b54d9ec diff --git a/qtcharts b/qtcharts index 055c6d6e49c..e30be213e48 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 055c6d6e49c5ea369990e7078fd534392a0ba6b9 +Subproject commit e30be213e483f2d6f3c40af0cbdc11a8e92e2026 diff --git a/qtconnectivity b/qtconnectivity index 47c424c7990..e957d4810b0 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 47c424c7990061714bd3108e3fbaa4339ba411b9 +Subproject commit e957d4810b05d8453e163d7bcdcab42d3c60a7bb diff --git a/qtdatavis3d b/qtdatavis3d index 8e1a57efa1b..9f0f50ebef0 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 8e1a57efa1ba3eabbf44098ce6ede3d130c57b5d +Subproject commit 9f0f50ebef04d5ac5ed0ee2a3a71e7748fce3005 diff --git a/qtdeclarative b/qtdeclarative index da0aac10575..f5701f0def3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit da0aac1057552048f59075beb31861a6cc076684 +Subproject commit f5701f0def37fcc0c2b38ae9552eb3a896a34687 diff --git a/qtdoc b/qtdoc index 6521ffa081d..c0c7bf07dd2 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 6521ffa081dca635b7bf9a47da18df5eac2d2d89 +Subproject commit c0c7bf07dd2023beb52abe86b69603cb30943036 diff --git a/qtgamepad b/qtgamepad index ce0202d67bf..ad63dc64f4b 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit ce0202d67bf1ab2bb887f58122b20eab5b6c1d5d +Subproject commit ad63dc64f4bdafb503f7015d04e8849cef5d99b4 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index a2b1600300c..4119e4e6dc9 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit a2b1600300cda89804d48ec90e0068a075fecc8b +Subproject commit 4119e4e6dc94447d773a01c1d6e4de0fefb9235a diff --git a/qtimageformats b/qtimageformats index 7824fe51318..2dcf2899b02 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 7824fe51318b8a87caa9ef3ed4db99914e22e6e4 +Subproject commit 2dcf2899b022accfef5cede1c2ea3dda2d0d6a4a diff --git a/qtlocation b/qtlocation index 597c98851d8..98a5c511ea7 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 597c98851d85a5f1f03abfaaf8c91a33a963d9f0 +Subproject commit 98a5c511ea753edc9a28a5610d6e2234df049293 diff --git a/qtlottie b/qtlottie index 8bb9237e4e1..56f94cb8e2d 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 8bb9237e4e1462f405d931a8a513ed4c27632d9e +Subproject commit 56f94cb8e2da9801ada7aa06f86ccf807f5a4ed8 diff --git a/qtmacextras b/qtmacextras index e7d4c378109..bc397be87f9 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit e7d4c37810976b6a1730d842cbca04b66ca7de30 +Subproject commit bc397be87f9b02e8279cfe2fc9b893c9f95219b9 diff --git a/qtmultimedia b/qtmultimedia index 981ed7e4ecf..f03440793e1 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 981ed7e4ecfcc27cbe9c0492b31f89386335155c +Subproject commit f03440793e1638687d0754b82d206817dc3775e7 diff --git a/qtnetworkauth b/qtnetworkauth index f34ac77b595..f082a4c84c5 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit f34ac77b5955126be60faa2b801be2d19dff896f +Subproject commit f082a4c84c54e888b8d023ba68b7085551403425 diff --git a/qtpurchasing b/qtpurchasing index 25ead89b083..9dfea35b04d 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 25ead89b0834f669e0a193e6d6cf2da25d33a452 +Subproject commit 9dfea35b04dcb52d02d7a2883df88d89ba9999ef diff --git a/qtquick3d b/qtquick3d index 1d1420cd7e4..b85cf622364 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 1d1420cd7e49dd588b8986952c0bcd6b7e6b83cb +Subproject commit b85cf6223645285dbc3f8cf2aeedbfa2bfa39736 diff --git a/qtquickcontrols b/qtquickcontrols index c7dae5f6041..18977875d16 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit c7dae5f6041d6c076311f2d8ed13fcfe3598be70 +Subproject commit 18977875d16e22ad68a1dc2d7ee0a9c9f873c941 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 5b169fcfcb1..3a657dc092b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 5b169fcfcb123c5a129ba63133dd27c56675a479 +Subproject commit 3a657dc092bea4d21f281368b0caad01e1aa6e32 diff --git a/qtquicktimeline b/qtquicktimeline index e2438e010a9..4cd0142a30b 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit e2438e010a98d731317c10a64c095e0282b51ab0 +Subproject commit 4cd0142a30bfa5eef47c720ac24dd73e12764806 diff --git a/qtremoteobjects b/qtremoteobjects index 5f2a598a913..929c7ad0676 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 5f2a598a9134167a0da2efcbf1249fc167ae3750 +Subproject commit 929c7ad0676f084b9ecc469cd47a307596923cb3 diff --git a/qtscxml b/qtscxml index e1faea1db52..0c93f94a44e 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit e1faea1db52b91d90ef64dd57eb6529e323b5526 +Subproject commit 0c93f94a44e2dce7eed9d17d4976b0c1e14be7bb diff --git a/qtsensors b/qtsensors index 5f1f73fdba8..6add85fa1a2 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 5f1f73fdba8906f58c4554cbef9c1a72edcf0230 +Subproject commit 6add85fa1a234a7e1943ba175c6fc799ccbae48e diff --git a/qtserialbus b/qtserialbus index 180cb13048a..ced5c7223d0 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 180cb13048a24510f9a1b20796772d27da762bdd +Subproject commit ced5c7223d037aece1e7f37d4314f388252de025 diff --git a/qtserialport b/qtserialport index 966cf2a2077..e2851096dc6 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 966cf2a2077a8470715894363ad46ea7df0665fa +Subproject commit e2851096dc6f6a7cfa635d69ea950b382e3658ab diff --git a/qtspeech b/qtspeech index b598a509f5c..17fc9fde486 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit b598a509f5cfb78090ecea74d43182482d719fce +Subproject commit 17fc9fde48605664b24fe8508ac8192dea289557 diff --git a/qtsvg b/qtsvg index ea8154f37ca..0c05780ea31 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit ea8154f37ca56b6b9951e2581ea1dda5cc060e57 +Subproject commit 0c05780ea319ca9e9576ce3eb2ddea18b0ee975e diff --git a/qttools b/qttools index 7a197fadc9a..6914f7c8039 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7a197fadc9af18a446a5de8f026b298ce343e923 +Subproject commit 6914f7c8039e5d9aab9446a6d0d882caf9f61025 diff --git a/qttranslations b/qttranslations index c38edd3a550..af8cd030fed 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c38edd3a5501bcd53132e1e4abb7d25a98e0e1a9 +Subproject commit af8cd030fed6a47cc1e8727e7ee5445e037bf712 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 8aebadb96c1..5f66c957130 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 8aebadb96c1e57ba89bba2e5962399f676207a32 +Subproject commit 5f66c9571303170f07954f73b09cad4cee1ce5d0 diff --git a/qtwayland b/qtwayland index 2ce7b8d2c53..dfb0129c01d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2ce7b8d2c5355d91642256d9260222d211cc368c +Subproject commit dfb0129c01d2aadc996cce6ef9abcfc49e33ae70 diff --git a/qtwebchannel b/qtwebchannel index 309144f77a5..618422eece5 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 309144f77a568e31b1b916a3b7c9c587fe54ea2c +Subproject commit 618422eece5f4103ecf2094d79d09c230a1707f5 diff --git a/qtwebglplugin b/qtwebglplugin index 3087cdd0758..655be6c5406 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 3087cdd0758258163299602550f7d4e72edf2a80 +Subproject commit 655be6c5406f8ba42acaca363fc55d78a6198733 diff --git a/qtwebsockets b/qtwebsockets index 66509bb4542..65850954336 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 66509bb4542e654b6cc5dcd90c160f1cd222ead7 +Subproject commit 658509543361fc698c1a2720219baabaa3ba59d5 diff --git a/qtwebview b/qtwebview index b1605fea61a..dfd86e07019 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit b1605fea61a6bbb599b720c54282bc8ddb0aacf0 +Subproject commit dfd86e07019488954cddcf2ba314df3cd0c01c0c diff --git a/qtwinextras b/qtwinextras index 2a04b162451..48318520a40 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 2a04b162451460ffc208c2c27acce16a18f763ce +Subproject commit 48318520a4031167c4c0ad559e1a11b2f4c053d6 diff --git a/qtx11extras b/qtx11extras index 9134cdba938..e44c85e8643 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 9134cdba9386e408ce2ffe515ca0c3f6f6c66685 +Subproject commit e44c85e8643f2724109993a7b9eaf0dff3530fec diff --git a/qtxmlpatterns b/qtxmlpatterns index b798a0f0265..3199d91de3f 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit b798a0f0265538a9dd12b5c7e4dad84ba8e1db4e +Subproject commit 3199d91de3f38e5ece3d36bcefe2c33b2c014f3f From b9fd0a20a60b82cd91fdc86cb54d0eb7adf29eae Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Wed, 5 Apr 2023 23:56:17 +0300 Subject: [PATCH 098/106] Merge Qt 5.15.9 opensource release Change-Id: I4524ceddd2a4c766d86328d4d3d099a42a336a44 --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index c3c7e6ebc29..e94b0fa39a2 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c3c7e6ebc29cce466d954f72f340a257d76b5ec2 +Subproject commit e94b0fa39a2f4bf260969fb18bf075dba39b2df1 diff --git a/qtactiveqt b/qtactiveqt index 2334cafc110..38635c3b343 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2334cafc110c4e63bec3a5c7abdcd67e5e5ee754 +Subproject commit 38635c3b343ce30b71e44c5a59f2f7393fba8259 diff --git a/qtandroidextras b/qtandroidextras index 7ede0a6c555..b458aee3f90 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 7ede0a6c555518a3fecba8930d5e4d9c58875d0d +Subproject commit b458aee3f907f2ce1880ad4031abecb2a1eab90a diff --git a/qtbase b/qtbase index 4ee4fc18b40..42e4ae042a4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4ee4fc18b4067b90efa46ca9baba74f53b54d9ec +Subproject commit 42e4ae042a4c86e58bcb8b6d2d59ba4a988285b4 diff --git a/qtcharts b/qtcharts index e30be213e48..3d4a84eb6d6 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit e30be213e483f2d6f3c40af0cbdc11a8e92e2026 +Subproject commit 3d4a84eb6d62ce22a47794f309f9268729ac375f diff --git a/qtconnectivity b/qtconnectivity index e957d4810b0..3dcb548bd6f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e957d4810b05d8453e163d7bcdcab42d3c60a7bb +Subproject commit 3dcb548bd6fe4aa488ca0bac95e65a7a366c3eca diff --git a/qtdatavis3d b/qtdatavis3d index 9f0f50ebef0..7636478bb30 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 9f0f50ebef04d5ac5ed0ee2a3a71e7748fce3005 +Subproject commit 7636478bb30f0af8afe9af429eb8512d6fbcc11b diff --git a/qtdeclarative b/qtdeclarative index f5701f0def3..19ed7973a31 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f5701f0def37fcc0c2b38ae9552eb3a896a34687 +Subproject commit 19ed7973a311a8d42d3a558bb551230e902ce9b9 diff --git a/qtdoc b/qtdoc index c0c7bf07dd2..9bb4a9bf55c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c0c7bf07dd2023beb52abe86b69603cb30943036 +Subproject commit 9bb4a9bf55c0673f946a5c756043d33b7f239f7f diff --git a/qtgamepad b/qtgamepad index ad63dc64f4b..7c05744e38d 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit ad63dc64f4bdafb503f7015d04e8849cef5d99b4 +Subproject commit 7c05744e38d44afac687df3349d548c8790837db diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 4119e4e6dc9..06cfcbb6940 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 4119e4e6dc94447d773a01c1d6e4de0fefb9235a +Subproject commit 06cfcbb6940d2729f5a6575e264873ce65ac99c3 diff --git a/qtimageformats b/qtimageformats index 2dcf2899b02..1f67161fea6 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 2dcf2899b022accfef5cede1c2ea3dda2d0d6a4a +Subproject commit 1f67161fea6beb2ed4c09849abe446c6a880af8a diff --git a/qtlocation b/qtlocation index 98a5c511ea7..e3e9f9bf42c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 98a5c511ea753edc9a28a5610d6e2234df049293 +Subproject commit e3e9f9bf42c22565f226b3431cb8c17502cc2e7a diff --git a/qtlottie b/qtlottie index 56f94cb8e2d..f9f123a9798 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 56f94cb8e2da9801ada7aa06f86ccf807f5a4ed8 +Subproject commit f9f123a97989638c36b5c2b03f4ff6261ddaed9a diff --git a/qtmacextras b/qtmacextras index bc397be87f9..209e3ddcf0a 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit bc397be87f9b02e8279cfe2fc9b893c9f95219b9 +Subproject commit 209e3ddcf0a6b48ff47a7dc97f2ea38470c8780d diff --git a/qtmultimedia b/qtmultimedia index f03440793e1..9dbea27ea43 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f03440793e1638687d0754b82d206817dc3775e7 +Subproject commit 9dbea27ea43206c2d210e4b4cc48af169ada3847 diff --git a/qtnetworkauth b/qtnetworkauth index f082a4c84c5..59311ee7d78 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit f082a4c84c54e888b8d023ba68b7085551403425 +Subproject commit 59311ee7d78a8b19d3dbe61cf49d42c5bd7c934a diff --git a/qtpurchasing b/qtpurchasing index 9dfea35b04d..5737c10128c 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 9dfea35b04dcb52d02d7a2883df88d89ba9999ef +Subproject commit 5737c10128c6eeb28c10df569c8492bb2e8f4230 diff --git a/qtquick3d b/qtquick3d index b85cf622364..a78f1c57dfb 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit b85cf6223645285dbc3f8cf2aeedbfa2bfa39736 +Subproject commit a78f1c57dfb3459be43c856d6bda16f3dfdc3b15 diff --git a/qtquickcontrols b/qtquickcontrols index 18977875d16..eb9dead185a 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 18977875d16e22ad68a1dc2d7ee0a9c9f873c941 +Subproject commit eb9dead185ae209dd2364d09db74d8ab613d982d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 3a657dc092b..5e31cdc9dda 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 3a657dc092bea4d21f281368b0caad01e1aa6e32 +Subproject commit 5e31cdc9dda940aee38cf8de4ddbbeb2c0cebfc7 diff --git a/qtquicktimeline b/qtquicktimeline index 4cd0142a30b..dd5d4af6589 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 4cd0142a30bfa5eef47c720ac24dd73e12764806 +Subproject commit dd5d4af65890baad8baa85a445a752a877a4f7e3 diff --git a/qtremoteobjects b/qtremoteobjects index 929c7ad0676..27b496d5aff 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 929c7ad0676f084b9ecc469cd47a307596923cb3 +Subproject commit 27b496d5aff650e4cf9a3148857c723dce10ef25 diff --git a/qtscxml b/qtscxml index 0c93f94a44e..d30a7711183 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 0c93f94a44e2dce7eed9d17d4976b0c1e14be7bb +Subproject commit d30a77111835395828fdcaa89a88110c5d9f6857 diff --git a/qtsensors b/qtsensors index 6add85fa1a2..391c710b888 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 6add85fa1a234a7e1943ba175c6fc799ccbae48e +Subproject commit 391c710b88865a3e0311b61d93fcdbbfd6996d46 diff --git a/qtserialbus b/qtserialbus index ced5c7223d0..f8684ae6b0c 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit ced5c7223d037aece1e7f37d4314f388252de025 +Subproject commit f8684ae6b0c12b6b21f1547fabe38b60c39f8893 diff --git a/qtserialport b/qtserialport index e2851096dc6..7fb308ec721 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit e2851096dc6f6a7cfa635d69ea950b382e3658ab +Subproject commit 7fb308ec721f034a0d673784d951577d764a8e67 diff --git a/qtspeech b/qtspeech index 17fc9fde486..b2fdbe275f5 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 17fc9fde48605664b24fe8508ac8192dea289557 +Subproject commit b2fdbe275f558893096356d152162df9f67cd22d diff --git a/qtsvg b/qtsvg index 0c05780ea31..78ec450b81c 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 0c05780ea319ca9e9576ce3eb2ddea18b0ee975e +Subproject commit 78ec450b81c403d3b4e6a2c178e300cef3637cca diff --git a/qttools b/qttools index 6914f7c8039..1e7d50937f4 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6914f7c8039e5d9aab9446a6d0d882caf9f61025 +Subproject commit 1e7d50937f4b94c37a16f6370c0fd4ccb4329190 diff --git a/qttranslations b/qttranslations index af8cd030fed..2b802231af3 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit af8cd030fed6a47cc1e8727e7ee5445e037bf712 +Subproject commit 2b802231af3eb21c3c781753aba804217f855e86 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 5f66c957130..4191fd9098a 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 5f66c9571303170f07954f73b09cad4cee1ce5d0 +Subproject commit 4191fd9098ae25ffd5917370427460842e73f0cb diff --git a/qtwayland b/qtwayland index dfb0129c01d..8f56244ea77 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit dfb0129c01d2aadc996cce6ef9abcfc49e33ae70 +Subproject commit 8f56244ea77a54da7593a7d65a4e5470d34e905e diff --git a/qtwebchannel b/qtwebchannel index 618422eece5..c23cff71f1b 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 618422eece5f4103ecf2094d79d09c230a1707f5 +Subproject commit c23cff71f1b8f69b3ca2e08cfe11d9673de87366 diff --git a/qtwebglplugin b/qtwebglplugin index 655be6c5406..64beacdd2d0 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 655be6c5406f8ba42acaca363fc55d78a6198733 +Subproject commit 64beacdd2d0f6fe0796bd291c9ab33f206a333c3 diff --git a/qtwebsockets b/qtwebsockets index 65850954336..7d09b696149 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 658509543361fc698c1a2720219baabaa3ba59d5 +Subproject commit 7d09b6961496f6cc33668ef494d0b58f75004fcb diff --git a/qtwebview b/qtwebview index dfd86e07019..23d67d0de33 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit dfd86e07019488954cddcf2ba314df3cd0c01c0c +Subproject commit 23d67d0de3301dbed5d8c5880b6cf60bfa9eeb2a diff --git a/qtwinextras b/qtwinextras index 48318520a40..44d18eaff83 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 48318520a4031167c4c0ad559e1a11b2f4c053d6 +Subproject commit 44d18eaff83b7491a130e41678cadcc3ba836a8d diff --git a/qtx11extras b/qtx11extras index e44c85e8643..8bba77a5580 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit e44c85e8643f2724109993a7b9eaf0dff3530fec +Subproject commit 8bba77a558049727d1bc88736dd03d1b5c41cead diff --git a/qtxmlpatterns b/qtxmlpatterns index 3199d91de3f..fa0c41677ab 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 3199d91de3f38e5ece3d36bcefe2c33b2c014f3f +Subproject commit fa0c41677ab43bc50bc4d086dfce96602060b7e0 From da2e0a59fa38644a95047fe389d955dc71b31fc8 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Tue, 6 Jun 2023 22:04:17 +0300 Subject: [PATCH 099/106] Merge Qt 5.15.10 opensource release Change-Id: Idcdec5e59815996a2b614f0e3cde32063a4c39cf --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index e94b0fa39a2..01aa0a9cb22 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e94b0fa39a2f4bf260969fb18bf075dba39b2df1 +Subproject commit 01aa0a9cb22ce5ed2b7ead03ed9cbeb5f978e897 diff --git a/qtactiveqt b/qtactiveqt index 38635c3b343..7a04a93e973 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 38635c3b343ce30b71e44c5a59f2f7393fba8259 +Subproject commit 7a04a93e97390de2d91e89dc907e8240dd5a0c4f diff --git a/qtandroidextras b/qtandroidextras index b458aee3f90..1170e17043f 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit b458aee3f907f2ce1880ad4031abecb2a1eab90a +Subproject commit 1170e17043ff51590ccee30447bef1e43a999b0d diff --git a/qtbase b/qtbase index 42e4ae042a4..29400a683f9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 42e4ae042a4c86e58bcb8b6d2d59ba4a988285b4 +Subproject commit 29400a683f96867133b28299c0d0bd6bcf40df35 diff --git a/qtcharts b/qtcharts index 3d4a84eb6d6..7ce22b0633e 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 3d4a84eb6d62ce22a47794f309f9268729ac375f +Subproject commit 7ce22b0633eb9d1eb59854fee4f2f545e1b842e0 diff --git a/qtconnectivity b/qtconnectivity index 3dcb548bd6f..e2dd32305ec 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 3dcb548bd6fe4aa488ca0bac95e65a7a366c3eca +Subproject commit e2dd32305ec52c96518a4357423d546c7c66f9a6 diff --git a/qtdatavis3d b/qtdatavis3d index 7636478bb30..d366b0aad84 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 7636478bb30f0af8afe9af429eb8512d6fbcc11b +Subproject commit d366b0aad8454355acac79eddbab445c1108b1e9 diff --git a/qtdeclarative b/qtdeclarative index 19ed7973a31..540c4e4a5de 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 19ed7973a311a8d42d3a558bb551230e902ce9b9 +Subproject commit 540c4e4a5def8c350a49bb68380b787ae62490c6 diff --git a/qtdoc b/qtdoc index 9bb4a9bf55c..52946b84206 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9bb4a9bf55c0673f946a5c756043d33b7f239f7f +Subproject commit 52946b842063c070be804bfbcaefbda77f1c6b05 diff --git a/qtgamepad b/qtgamepad index 7c05744e38d..f90bd729eb7 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 7c05744e38d44afac687df3349d548c8790837db +Subproject commit f90bd729eb70d4a0770efed3f9bb1b6dbe67d37c diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 06cfcbb6940..500ae59f809 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 06cfcbb6940d2729f5a6575e264873ce65ac99c3 +Subproject commit 500ae59f809877e0ada9a68601564882f2733145 diff --git a/qtimageformats b/qtimageformats index 1f67161fea6..e57b0df609d 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 1f67161fea6beb2ed4c09849abe446c6a880af8a +Subproject commit e57b0df609d744c3ddb2d3f23926a7922e661cb6 diff --git a/qtlocation b/qtlocation index e3e9f9bf42c..a87a9d1a305 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e3e9f9bf42c22565f226b3431cb8c17502cc2e7a +Subproject commit a87a9d1a3054267b39618cb2f3762a0a05ac510c diff --git a/qtlottie b/qtlottie index f9f123a9798..f65b6a26883 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit f9f123a97989638c36b5c2b03f4ff6261ddaed9a +Subproject commit f65b6a268832fc86e1263a6597f2e369aefecd19 diff --git a/qtmacextras b/qtmacextras index 209e3ddcf0a..ca5e5fdca44 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 209e3ddcf0a6b48ff47a7dc97f2ea38470c8780d +Subproject commit ca5e5fdca44e8e56dafaac2a5bd886cad2a5c0f5 diff --git a/qtmultimedia b/qtmultimedia index 9dbea27ea43..baeb08ba3ab 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9dbea27ea43206c2d210e4b4cc48af169ada3847 +Subproject commit baeb08ba3ab23b2266d1bad45bb7a2769b841c2e diff --git a/qtnetworkauth b/qtnetworkauth index 59311ee7d78..a0f23c6a1f1 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 59311ee7d78a8b19d3dbe61cf49d42c5bd7c934a +Subproject commit a0f23c6a1f11bd7c6a8e4fd34f10bdb0a35789fa diff --git a/qtpurchasing b/qtpurchasing index 5737c10128c..a3e675872e4 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 5737c10128c6eeb28c10df569c8492bb2e8f4230 +Subproject commit a3e675872e4b323f89b94b90b66caa945b576b2e diff --git a/qtquick3d b/qtquick3d index a78f1c57dfb..b485a86d895 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit a78f1c57dfb3459be43c856d6bda16f3dfdc3b15 +Subproject commit b485a86d895a05c7a254ce7d4b666c5a04e50344 diff --git a/qtquickcontrols b/qtquickcontrols index eb9dead185a..0ea7cfdfbfa 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit eb9dead185ae209dd2364d09db74d8ab613d982d +Subproject commit 0ea7cfdfbfa72d467fe542cc48ab3206c177a387 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 5e31cdc9dda..c433697a686 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 5e31cdc9dda940aee38cf8de4ddbbeb2c0cebfc7 +Subproject commit c433697a686e7a24dc4bfd58f2a46c05ae7b7716 diff --git a/qtquicktimeline b/qtquicktimeline index dd5d4af6589..4956b556ccb 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit dd5d4af65890baad8baa85a445a752a877a4f7e3 +Subproject commit 4956b556ccb021e4691f314ab907ea2ebb1ca8a6 diff --git a/qtremoteobjects b/qtremoteobjects index 27b496d5aff..d10e7673218 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 27b496d5aff650e4cf9a3148857c723dce10ef25 +Subproject commit d10e7673218fa2b00191a82ad20cd3304a711fa6 diff --git a/qtscxml b/qtscxml index d30a7711183..7f276be586b 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit d30a77111835395828fdcaa89a88110c5d9f6857 +Subproject commit 7f276be586be79d41213a8dd05ef31144313d440 diff --git a/qtsensors b/qtsensors index 391c710b888..45c04582b15 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 391c710b88865a3e0311b61d93fcdbbfd6996d46 +Subproject commit 45c04582b15a9bb4be01ae99aa7fda1bbba7d0df diff --git a/qtserialbus b/qtserialbus index f8684ae6b0c..b3081c36bae 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit f8684ae6b0c12b6b21f1547fabe38b60c39f8893 +Subproject commit b3081c36baee48b43b6285b4811dc6da451e2390 diff --git a/qtserialport b/qtserialport index 7fb308ec721..af58a4c6241 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 7fb308ec721f034a0d673784d951577d764a8e67 +Subproject commit af58a4c62415fbfd997c43422acf93e2e6ab5155 diff --git a/qtspeech b/qtspeech index b2fdbe275f5..87bd324ae56 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit b2fdbe275f558893096356d152162df9f67cd22d +Subproject commit 87bd324ae562683d3eda0063e0de338c0c13833e diff --git a/qtsvg b/qtsvg index 78ec450b81c..7e6a3b38b2e 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 78ec450b81c403d3b4e6a2c178e300cef3637cca +Subproject commit 7e6a3b38b2e898d90cef68a146cd36fda22e4363 diff --git a/qttools b/qttools index 1e7d50937f4..7918981beb4 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1e7d50937f4b94c37a16f6370c0fd4ccb4329190 +Subproject commit 7918981beb4bcefea4f686370d38c99fcefaf33e diff --git a/qttranslations b/qttranslations index 2b802231af3..a680686754d 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 2b802231af3eb21c3c781753aba804217f855e86 +Subproject commit a680686754d84b91d4cc4252a2fb8af0c58f5f49 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 4191fd9098a..72373522141 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 4191fd9098ae25ffd5917370427460842e73f0cb +Subproject commit 72373522141dd3206183eb5fa56ae1c36a6d4c2b diff --git a/qtwayland b/qtwayland index 8f56244ea77..9e0ec09db17 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8f56244ea77a54da7593a7d65a4e5470d34e905e +Subproject commit 9e0ec09db176f688cddea0607296322e9fb823e9 diff --git a/qtwebchannel b/qtwebchannel index c23cff71f1b..fc02db2d5e7 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit c23cff71f1b8f69b3ca2e08cfe11d9673de87366 +Subproject commit fc02db2d5e713d3ce5b0c3999c9cd13765e6f27e diff --git a/qtwebglplugin b/qtwebglplugin index 64beacdd2d0..13202e8a8c0 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 64beacdd2d0f6fe0796bd291c9ab33f206a333c3 +Subproject commit 13202e8a8c0c6d39026344b5a19a0148592160bc diff --git a/qtwebsockets b/qtwebsockets index 7d09b696149..33f36d90fe9 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 7d09b6961496f6cc33668ef494d0b58f75004fcb +Subproject commit 33f36d90fe972c15753d2c2db363ae0dea40d585 diff --git a/qtwebview b/qtwebview index 23d67d0de33..7e941648610 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 23d67d0de3301dbed5d8c5880b6cf60bfa9eeb2a +Subproject commit 7e941648610ff4033ae8f9709077edd0595364f0 diff --git a/qtwinextras b/qtwinextras index 44d18eaff83..5afc77f5347 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 44d18eaff83b7491a130e41678cadcc3ba836a8d +Subproject commit 5afc77f5347113b607ca0262505f3406e1be5bf4 diff --git a/qtx11extras b/qtx11extras index 8bba77a5580..74f81f0bfe1 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 8bba77a558049727d1bc88736dd03d1b5c41cead +Subproject commit 74f81f0bfe17e5aabcebafcb0cf36f739133554c diff --git a/qtxmlpatterns b/qtxmlpatterns index fa0c41677ab..0c1dcfe344c 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit fa0c41677ab43bc50bc4d086dfce96602060b7e0 +Subproject commit 0c1dcfe344c03d48d753aeb58f139bc990f2611c From 6508627d500d3f7b9a4f7b12019476e982abfa50 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Wed, 4 Oct 2023 18:18:50 +0300 Subject: [PATCH 100/106] Merge Qt 5.15.11 opensource release Change-Id: I5b8c7c55a5ab3c4e0c1df5876c00031a33366599 --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index 01aa0a9cb22..c1f8fa2578d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 01aa0a9cb22ce5ed2b7ead03ed9cbeb5f978e897 +Subproject commit c1f8fa2578d99e07f5e581f26bd532695b9534f9 diff --git a/qtactiveqt b/qtactiveqt index 7a04a93e973..2ed4be9e852 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 7a04a93e97390de2d91e89dc907e8240dd5a0c4f +Subproject commit 2ed4be9e852d2533b982493a26bf061b245dc106 diff --git a/qtandroidextras b/qtandroidextras index 1170e17043f..3d30862e761 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 1170e17043ff51590ccee30447bef1e43a999b0d +Subproject commit 3d30862e761afd5fe8451857bb531b6fb8f63dc3 diff --git a/qtbase b/qtbase index 29400a683f9..da6e958319e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 29400a683f96867133b28299c0d0bd6bcf40df35 +Subproject commit da6e958319e95fe564d3b30c931492dd666bfaff diff --git a/qtcharts b/qtcharts index 7ce22b0633e..e17308d5ce8 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 7ce22b0633eb9d1eb59854fee4f2f545e1b842e0 +Subproject commit e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826 diff --git a/qtconnectivity b/qtconnectivity index e2dd32305ec..f0c98c39447 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e2dd32305ec52c96518a4357423d546c7c66f9a6 +Subproject commit f0c98c39447894bba493aa91c65053d7f18d68cb diff --git a/qtdatavis3d b/qtdatavis3d index d366b0aad84..d7af24d26b9 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit d366b0aad8454355acac79eddbab445c1108b1e9 +Subproject commit d7af24d26b9fbb83bf57b2b7245d280eb78e8b22 diff --git a/qtdeclarative b/qtdeclarative index 540c4e4a5de..960a980dc88 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 540c4e4a5def8c350a49bb68380b787ae62490c6 +Subproject commit 960a980dc885622cb84990c4da75d5060318302d diff --git a/qtdoc b/qtdoc index 52946b84206..362b09c89e0 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 52946b842063c070be804bfbcaefbda77f1c6b05 +Subproject commit 362b09c89e0283aa15963a322a083ba1ba69b157 diff --git a/qtgamepad b/qtgamepad index f90bd729eb7..4b52913503e 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit f90bd729eb70d4a0770efed3f9bb1b6dbe67d37c +Subproject commit 4b52913503e3713200265cd6bc19b301792dbf96 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 500ae59f809..cce7d784237 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 500ae59f809877e0ada9a68601564882f2733145 +Subproject commit cce7d784237cd2dd4af1abe2757d048e34e02685 diff --git a/qtimageformats b/qtimageformats index e57b0df609d..6a1af670d52 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit e57b0df609d744c3ddb2d3f23926a7922e661cb6 +Subproject commit 6a1af670d52492ab0955933b830026b2a18ed6d6 diff --git a/qtlocation b/qtlocation index a87a9d1a305..0ec8f5e82da 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a87a9d1a3054267b39618cb2f3762a0a05ac510c +Subproject commit 0ec8f5e82da7369a92824167c4d7331f6c502325 diff --git a/qtlottie b/qtlottie index f65b6a26883..909b79f4810 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit f65b6a268832fc86e1263a6597f2e369aefecd19 +Subproject commit 909b79f4810b8ac62baa3544837793cfb132593b diff --git a/qtmacextras b/qtmacextras index ca5e5fdca44..cc717d0093d 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit ca5e5fdca44e8e56dafaac2a5bd886cad2a5c0f5 +Subproject commit cc717d0093d796e6bafb65892e6825f146c1d3cd diff --git a/qtmultimedia b/qtmultimedia index baeb08ba3ab..b4d58d8921d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit baeb08ba3ab23b2266d1bad45bb7a2769b841c2e +Subproject commit b4d58d8921d6d1c937b5e708e257e2a07a0c5dc4 diff --git a/qtnetworkauth b/qtnetworkauth index a0f23c6a1f1..1e3f2196bd4 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit a0f23c6a1f11bd7c6a8e4fd34f10bdb0a35789fa +Subproject commit 1e3f2196bd45a5ee272b08b1d82cef29aaa89b61 diff --git a/qtpurchasing b/qtpurchasing index a3e675872e4..736144c5827 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit a3e675872e4b323f89b94b90b66caa945b576b2e +Subproject commit 736144c5827385000e391e9a55a0f0162b7e8112 diff --git a/qtquick3d b/qtquick3d index b485a86d895..18711bd8a1d 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit b485a86d895a05c7a254ce7d4b666c5a04e50344 +Subproject commit 18711bd8a1df79c3fbbfc408aa3478eed0772988 diff --git a/qtquickcontrols b/qtquickcontrols index 0ea7cfdfbfa..dcc90558d9c 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 0ea7cfdfbfa72d467fe542cc48ab3206c177a387 +Subproject commit dcc90558d9c0cba41eec7df290943994289b0e87 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index c433697a686..1ce461bd1dc 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit c433697a686e7a24dc4bfd58f2a46c05ae7b7716 +Subproject commit 1ce461bd1dc713cd2f79fc16c5454d587b45eefa diff --git a/qtquicktimeline b/qtquicktimeline index 4956b556ccb..b1b4b882dab 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 4956b556ccb021e4691f314ab907ea2ebb1ca8a6 +Subproject commit b1b4b882dabaa036c3fb73c4a879ba8efbb02ded diff --git a/qtremoteobjects b/qtremoteobjects index d10e7673218..bdc316aca82 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit d10e7673218fa2b00191a82ad20cd3304a711fa6 +Subproject commit bdc316aca82769b43cb7821c10d80a1ca02b846e diff --git a/qtscxml b/qtscxml index 7f276be586b..e8727aabe55 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 7f276be586be79d41213a8dd05ef31144313d440 +Subproject commit e8727aabe55526956295407d27317ec15e12b283 diff --git a/qtsensors b/qtsensors index 45c04582b15..a41492b23cd 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 45c04582b15a9bb4be01ae99aa7fda1bbba7d0df +Subproject commit a41492b23cde20d1e00427d31e4637d06aea3638 diff --git a/qtserialbus b/qtserialbus index b3081c36bae..c41785c9f36 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit b3081c36baee48b43b6285b4811dc6da451e2390 +Subproject commit c41785c9f36560722b917d373ee97eed8cc4089a diff --git a/qtserialport b/qtserialport index af58a4c6241..3380465d5d4 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit af58a4c62415fbfd997c43422acf93e2e6ab5155 +Subproject commit 3380465d5d4977326616c5e57789a81681be650e diff --git a/qtspeech b/qtspeech index 87bd324ae56..214dcefc7c4 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 87bd324ae562683d3eda0063e0de338c0c13833e +Subproject commit 214dcefc7c408e11a3e9fe9d221e4a384e2eaca1 diff --git a/qtsvg b/qtsvg index 7e6a3b38b2e..3385b64df93 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 7e6a3b38b2e898d90cef68a146cd36fda22e4363 +Subproject commit 3385b64df939815e9df5955f991d270d47a5515b diff --git a/qttools b/qttools index 7918981beb4..ddf6686e9bc 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7918981beb4bcefea4f686370d38c99fcefaf33e +Subproject commit ddf6686e9bce7a3232af14a2966b4c895e654f02 diff --git a/qttranslations b/qttranslations index a680686754d..56065158ffc 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit a680686754d84b91d4cc4252a2fb8af0c58f5f49 +Subproject commit 56065158ffc4cd0fd78f9edf4b21b77b969f8dbb diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 72373522141..817378aa101 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 72373522141dd3206183eb5fa56ae1c36a6d4c2b +Subproject commit 817378aa10176fd26eed36542bc657e48d9dd42e diff --git a/qtwayland b/qtwayland index 9e0ec09db17..b8f1882df72 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 9e0ec09db176f688cddea0607296322e9fb823e9 +Subproject commit b8f1882df7215b6e00f66b7a6a08afafe230de29 diff --git a/qtwebchannel b/qtwebchannel index fc02db2d5e7..48a520c11a0 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit fc02db2d5e713d3ce5b0c3999c9cd13765e6f27e +Subproject commit 48a520c11a0ef57f2553746159acf739c7f3863d diff --git a/qtwebglplugin b/qtwebglplugin index 13202e8a8c0..ddcff45e8f2 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 13202e8a8c0c6d39026344b5a19a0148592160bc +Subproject commit ddcff45e8f2ca9f229017b3ded62327d2fb50af2 diff --git a/qtwebsockets b/qtwebsockets index 33f36d90fe9..50f3853a83f 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 33f36d90fe972c15753d2c2db363ae0dea40d585 +Subproject commit 50f3853a83ffc80a978cfa0882bdc2859e8de71e diff --git a/qtwebview b/qtwebview index 7e941648610..f078642eb9a 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 7e941648610ff4033ae8f9709077edd0595364f0 +Subproject commit f078642eb9a440f6aa88f2beaf10f445de1e29bb diff --git a/qtwinextras b/qtwinextras index 5afc77f5347..1bf19cc6a79 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 5afc77f5347113b607ca0262505f3406e1be5bf4 +Subproject commit 1bf19cc6a7972d8543485786418b6631459d3469 diff --git a/qtx11extras b/qtx11extras index 74f81f0bfe1..5fb2e067a38 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 74f81f0bfe17e5aabcebafcb0cf36f739133554c +Subproject commit 5fb2e067a38d3583684310130f5d8aad064f512f diff --git a/qtxmlpatterns b/qtxmlpatterns index 0c1dcfe344c..5a1948ddc05 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 0c1dcfe344c03d48d753aeb58f139bc990f2611c +Subproject commit 5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2 From c54886aa2cd2e538b91a0fc76276b46027156b24 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Wed, 20 Dec 2023 13:07:55 +0200 Subject: [PATCH 101/106] Merge Qt 5.15.12 opensource release Change-Id: I0237802dd988289a6548a86b3d9884d00ad6d841 --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index c1f8fa2578d..e1b1a0d2970 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c1f8fa2578d99e07f5e581f26bd532695b9534f9 +Subproject commit e1b1a0d2970fd384bd52c734a72536d8452ad070 diff --git a/qtactiveqt b/qtactiveqt index 2ed4be9e852..4fc1cba4c41 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2ed4be9e852d2533b982493a26bf061b245dc106 +Subproject commit 4fc1cba4c415d84a5879da29f7c459b70fbc15e9 diff --git a/qtandroidextras b/qtandroidextras index 3d30862e761..12d064b1611 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 3d30862e761afd5fe8451857bb531b6fb8f63dc3 +Subproject commit 12d064b16117c6f3418b494c927ef72cf1927929 diff --git a/qtbase b/qtbase index da6e958319e..e4391422574 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit da6e958319e95fe564d3b30c931492dd666bfaff +Subproject commit e4391422574aa9aa89fece74f16c07c609cbbae2 diff --git a/qtcharts b/qtcharts index e17308d5ce8..393a84ad5b1 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit e17308d5ce83a8b66aeeaaaf16ce16d4ee6b2826 +Subproject commit 393a84ad5b16a9ec93d8a44bebf1ae86e881bc06 diff --git a/qtconnectivity b/qtconnectivity index f0c98c39447..45604bedf6d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit f0c98c39447894bba493aa91c65053d7f18d68cb +Subproject commit 45604bedf6d3b022fc9758eeb4cefab0f9f2dea5 diff --git a/qtdatavis3d b/qtdatavis3d index d7af24d26b9..c887477198c 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit d7af24d26b9fbb83bf57b2b7245d280eb78e8b22 +Subproject commit c887477198cae44585fe9db371db0ddf4c3b205e diff --git a/qtdeclarative b/qtdeclarative index 960a980dc88..105e610548a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 960a980dc885622cb84990c4da75d5060318302d +Subproject commit 105e610548a62d943301153afb337a49f14e9e25 diff --git a/qtdoc b/qtdoc index 362b09c89e0..39b272474cb 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 362b09c89e0283aa15963a322a083ba1ba69b157 +Subproject commit 39b272474cbaca77563e58218172e9d7d59129cf diff --git a/qtgamepad b/qtgamepad index 4b52913503e..8ed95136b3c 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 4b52913503e3713200265cd6bc19b301792dbf96 +Subproject commit 8ed95136b3c265b01db6cc33869228f41878e173 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index cce7d784237..e33716bd6bb 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit cce7d784237cd2dd4af1abe2757d048e34e02685 +Subproject commit e33716bd6bb8926688fef20cb568e11618d08a35 diff --git a/qtimageformats b/qtimageformats index 6a1af670d52..1019058c497 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 6a1af670d52492ab0955933b830026b2a18ed6d6 +Subproject commit 1019058c497e33edef80d5cb120aa7d6a418a7c6 diff --git a/qtlocation b/qtlocation index 0ec8f5e82da..b6d96559cb9 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0ec8f5e82da7369a92824167c4d7331f6c502325 +Subproject commit b6d96559cb9f5e0d79936c89887ea924b2c3514a diff --git a/qtlottie b/qtlottie index 909b79f4810..db33cc9a4c0 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 909b79f4810b8ac62baa3544837793cfb132593b +Subproject commit db33cc9a4c0bad1006dbc9ed46d71b80ee284df3 diff --git a/qtmacextras b/qtmacextras index cc717d0093d..4cb89b861db 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit cc717d0093d796e6bafb65892e6825f146c1d3cd +Subproject commit 4cb89b861dbdbe8733c62bcdadc0a8d6617528a5 diff --git a/qtmultimedia b/qtmultimedia index b4d58d8921d..5197ff9e91c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit b4d58d8921d6d1c937b5e708e257e2a07a0c5dc4 +Subproject commit 5197ff9e91cabd90700cf0d36fb5e9e5793d7097 diff --git a/qtnetworkauth b/qtnetworkauth index 1e3f2196bd4..3fccc9b8fda 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 1e3f2196bd45a5ee272b08b1d82cef29aaa89b61 +Subproject commit 3fccc9b8fdaff1252fb4a9c516868d0bbbd4384d diff --git a/qtpurchasing b/qtpurchasing index 736144c5827..f563e7f2d16 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 736144c5827385000e391e9a55a0f0162b7e8112 +Subproject commit f563e7f2d1668a3d216e9d396e050df25fd15532 diff --git a/qtquick3d b/qtquick3d index 18711bd8a1d..d29b769a7f9 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 18711bd8a1df79c3fbbfc408aa3478eed0772988 +Subproject commit d29b769a7f9b0c106fc58c9fadd7c41379d14776 diff --git a/qtquickcontrols b/qtquickcontrols index dcc90558d9c..1ca962198a7 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit dcc90558d9c0cba41eec7df290943994289b0e87 +Subproject commit 1ca962198a703f591efc7c8f7540fc4120746a00 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1ce461bd1dc..7bd4fe4ca1d 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1ce461bd1dc713cd2f79fc16c5454d587b45eefa +Subproject commit 7bd4fe4ca1d0c4eeb062ac98dcf15b036df04df6 diff --git a/qtquicktimeline b/qtquicktimeline index b1b4b882dab..58f4f226620 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit b1b4b882dabaa036c3fb73c4a879ba8efbb02ded +Subproject commit 58f4f22662023efe6f223d5ef4a6d0be3708182b diff --git a/qtremoteobjects b/qtremoteobjects index bdc316aca82..f64e34be9ac 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit bdc316aca82769b43cb7821c10d80a1ca02b846e +Subproject commit f64e34be9ac4b7e92c63e47235c04471a1d40c93 diff --git a/qtscxml b/qtscxml index e8727aabe55..3f56c6b4bd1 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit e8727aabe55526956295407d27317ec15e12b283 +Subproject commit 3f56c6b4bd1e3883581340243b4a7289807fffc9 diff --git a/qtsensors b/qtsensors index a41492b23cd..3011b16d63c 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a41492b23cde20d1e00427d31e4637d06aea3638 +Subproject commit 3011b16d63cadbb473b6aa3a535b9f0e33170c09 diff --git a/qtserialbus b/qtserialbus index c41785c9f36..c64de6ad9f6 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c41785c9f36560722b917d373ee97eed8cc4089a +Subproject commit c64de6ad9f646aaa66fca0500d21cde802a7bb17 diff --git a/qtserialport b/qtserialport index 3380465d5d4..c3a7debff7a 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 3380465d5d4977326616c5e57789a81681be650e +Subproject commit c3a7debff7a4c6ddaedb795290180dd99d7ac4be diff --git a/qtspeech b/qtspeech index 214dcefc7c4..d02bcabe488 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 214dcefc7c408e11a3e9fe9d221e4a384e2eaca1 +Subproject commit d02bcabe488dee1164920fd1b0301bc8d2bec7d4 diff --git a/qtsvg b/qtsvg index 3385b64df93..7b88174eb38 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 3385b64df939815e9df5955f991d270d47a5515b +Subproject commit 7b88174eb38ab1da4cb54f52734a01c7440def0d diff --git a/qttools b/qttools index ddf6686e9bc..e089fe78e27 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ddf6686e9bce7a3232af14a2966b4c895e654f02 +Subproject commit e089fe78e2745f8316cadaa7492ab442c203b18d diff --git a/qttranslations b/qttranslations index 56065158ffc..f7745c11704 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 56065158ffc4cd0fd78f9edf4b21b77b969f8dbb +Subproject commit f7745c117041e7adf9705e1de8d71086c160dd9f diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 817378aa101..8b885af5ad3 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 817378aa10176fd26eed36542bc657e48d9dd42e +Subproject commit 8b885af5ad3c2f2ff500c060a41e312ea7276e50 diff --git a/qtwayland b/qtwayland index b8f1882df72..ec9fb19ead7 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b8f1882df7215b6e00f66b7a6a08afafe230de29 +Subproject commit ec9fb19ead796d88bb9a67a4ddd269870cbacb54 diff --git a/qtwebchannel b/qtwebchannel index 48a520c11a0..47af6a4db5b 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 48a520c11a0ef57f2553746159acf739c7f3863d +Subproject commit 47af6a4db5bc1faf3abf1152d7f0fdc2297387a1 diff --git a/qtwebglplugin b/qtwebglplugin index ddcff45e8f2..8f879e6bcf9 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit ddcff45e8f2ca9f229017b3ded62327d2fb50af2 +Subproject commit 8f879e6bcf941a612c568fbfe2b49ddb1bb409cd diff --git a/qtwebsockets b/qtwebsockets index 50f3853a83f..4a67d49f565 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 50f3853a83ffc80a978cfa0882bdc2859e8de71e +Subproject commit 4a67d49f565b90a827f35a2b090e196afe9accec diff --git a/qtwebview b/qtwebview index f078642eb9a..53fa4470999 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit f078642eb9a440f6aa88f2beaf10f445de1e29bb +Subproject commit 53fa44709992faae54e4f5c8a128cea7b6f0cbd5 diff --git a/qtwinextras b/qtwinextras index 1bf19cc6a79..ee931eba5d1 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 1bf19cc6a7972d8543485786418b6631459d3469 +Subproject commit ee931eba5d129284d5c33157cd7d0b9232fbee7b diff --git a/qtx11extras b/qtx11extras index 5fb2e067a38..aaa54153970 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 5fb2e067a38d3583684310130f5d8aad064f512f +Subproject commit aaa54153970d1d63a44b873cad5f62ffa71ef9b8 diff --git a/qtxmlpatterns b/qtxmlpatterns index 5a1948ddc05..6e0917d518e 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 5a1948ddc05bf44017ac12bd5c2b9bc79fbcb9a2 +Subproject commit 6e0917d518e07f737cc663b8d632c8021634fd3b From 0cbeef31b8da367c539eca6891a1778aff31e8a5 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Fri, 8 Mar 2024 11:34:13 +0200 Subject: [PATCH 102/106] Merge Qt 5.15.13 opensource release Change-Id: If178ddbd84f1d56220fb1dd2cba3876764190598 --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index e1b1a0d2970..67bee4599a2 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e1b1a0d2970fd384bd52c734a72536d8452ad070 +Subproject commit 67bee4599a28e1cadc14ed9ea4adc7061e250b90 diff --git a/qtactiveqt b/qtactiveqt index 4fc1cba4c41..014285857ef 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 4fc1cba4c415d84a5879da29f7c459b70fbc15e9 +Subproject commit 014285857ef1cfb2d9965cf7bad871bbc336ce60 diff --git a/qtandroidextras b/qtandroidextras index 12d064b1611..f4791ee1652 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 12d064b16117c6f3418b494c927ef72cf1927929 +Subproject commit f4791ee16526505ec1527056c45e3c9d6b3c44b6 diff --git a/qtbase b/qtbase index e4391422574..4e158f6bfa7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e4391422574aa9aa89fece74f16c07c609cbbae2 +Subproject commit 4e158f6bfa7d0747d8da70b3b15a44b52e35bb8a diff --git a/qtcharts b/qtcharts index 393a84ad5b1..3f3f14d69a5 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 393a84ad5b16a9ec93d8a44bebf1ae86e881bc06 +Subproject commit 3f3f14d69a509c3e8027bfb5d7ffca9b4f3ef003 diff --git a/qtconnectivity b/qtconnectivity index 45604bedf6d..f1fed9fb2a7 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 45604bedf6d3b022fc9758eeb4cefab0f9f2dea5 +Subproject commit f1fed9fb2a7e5b877d8408f92040651b0cf47dbb diff --git a/qtdatavis3d b/qtdatavis3d index c887477198c..6ac6d23a8f5 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit c887477198cae44585fe9db371db0ddf4c3b205e +Subproject commit 6ac6d23a8f558f36f1162b419858cc44dccd4d2b diff --git a/qtdeclarative b/qtdeclarative index 105e610548a..6ab9856ef37 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 105e610548a62d943301153afb337a49f14e9e25 +Subproject commit 6ab9856ef379fc3fe44d5fac03a83f679f398511 diff --git a/qtdoc b/qtdoc index 39b272474cb..bebd32616d8 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 39b272474cbaca77563e58218172e9d7d59129cf +Subproject commit bebd32616d892368706e4ee80abfcfc094f31dc4 diff --git a/qtgamepad b/qtgamepad index 8ed95136b3c..44255e2ae53 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 8ed95136b3c265b01db6cc33869228f41878e173 +Subproject commit 44255e2ae53a14e9a3fb671da0782ec5d396220a diff --git a/qtgraphicaleffects b/qtgraphicaleffects index e33716bd6bb..895f9753940 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit e33716bd6bb8926688fef20cb568e11618d08a35 +Subproject commit 895f9753940156dda05aa83d3c7655571514407e diff --git a/qtimageformats b/qtimageformats index 1019058c497..3c2ad3eed6f 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 1019058c497e33edef80d5cb120aa7d6a418a7c6 +Subproject commit 3c2ad3eed6fc522ad809797747c8028b3dd4778a diff --git a/qtlocation b/qtlocation index b6d96559cb9..f6953a8d604 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b6d96559cb9f5e0d79936c89887ea924b2c3514a +Subproject commit f6953a8d604b906b170fb4610e124e7c31260a18 diff --git a/qtlottie b/qtlottie index db33cc9a4c0..62f17bbc0ae 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit db33cc9a4c0bad1006dbc9ed46d71b80ee284df3 +Subproject commit 62f17bbc0ae8649178ac484afc434dbad16d6351 diff --git a/qtmacextras b/qtmacextras index 4cb89b861db..6ecba1864be 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 4cb89b861dbdbe8733c62bcdadc0a8d6617528a5 +Subproject commit 6ecba1864bee0ed9de0897d10a260149d00683e2 diff --git a/qtmultimedia b/qtmultimedia index 5197ff9e91c..374d71e29a1 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5197ff9e91cabd90700cf0d36fb5e9e5793d7097 +Subproject commit 374d71e29a142bd177cd5b1b7e29a4628085ddcb diff --git a/qtnetworkauth b/qtnetworkauth index 3fccc9b8fda..ed2291d454f 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 3fccc9b8fdaff1252fb4a9c516868d0bbbd4384d +Subproject commit ed2291d454fac207f6b1555d30b9227e51be611b diff --git a/qtpurchasing b/qtpurchasing index f563e7f2d16..7f4ead6f3e6 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit f563e7f2d1668a3d216e9d396e050df25fd15532 +Subproject commit 7f4ead6f3e6431acee63987a0a1753ff140ac2d2 diff --git a/qtquick3d b/qtquick3d index d29b769a7f9..fbb8186383e 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit d29b769a7f9b0c106fc58c9fadd7c41379d14776 +Subproject commit fbb8186383e7e3389b952c43781755346d5ce371 diff --git a/qtquickcontrols b/qtquickcontrols index 1ca962198a7..77fbfa8d313 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 1ca962198a703f591efc7c8f7540fc4120746a00 +Subproject commit 77fbfa8d313bbdb8fb762f15dd6173a067be55e3 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 7bd4fe4ca1d..480694ae720 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 7bd4fe4ca1d0c4eeb062ac98dcf15b036df04df6 +Subproject commit 480694ae720490b162747b07aa0e0bb7e7abc7da diff --git a/qtquicktimeline b/qtquicktimeline index 58f4f226620..29394e35db4 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 58f4f22662023efe6f223d5ef4a6d0be3708182b +Subproject commit 29394e35db43acb20e7b4d5e978a733f5b4232a6 diff --git a/qtremoteobjects b/qtremoteobjects index f64e34be9ac..18ef1cdce7b 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit f64e34be9ac4b7e92c63e47235c04471a1d40c93 +Subproject commit 18ef1cdce7bc4c93415f38f1c220ab697aa75908 diff --git a/qtscxml b/qtscxml index 3f56c6b4bd1..6074956c208 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 3f56c6b4bd1e3883581340243b4a7289807fffc9 +Subproject commit 6074956c2089dd0507d2930c638fa8c930f4e21c diff --git a/qtsensors b/qtsensors index 3011b16d63c..7f8b55744f8 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 3011b16d63cadbb473b6aa3a535b9f0e33170c09 +Subproject commit 7f8b55744f87155a4979dd8ba405bd7feec03042 diff --git a/qtserialbus b/qtserialbus index c64de6ad9f6..5efce7d821b 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c64de6ad9f646aaa66fca0500d21cde802a7bb17 +Subproject commit 5efce7d821bad2f5db95ff3ada5eeddccbb58920 diff --git a/qtserialport b/qtserialport index c3a7debff7a..fc0b6affe24 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit c3a7debff7a4c6ddaedb795290180dd99d7ac4be +Subproject commit fc0b6affe244e40366bd624d6e01c62712568eb8 diff --git a/qtspeech b/qtspeech index d02bcabe488..90e32fa6089 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit d02bcabe488dee1164920fd1b0301bc8d2bec7d4 +Subproject commit 90e32fa60897f223e80f3e78639c6ba9674c5ad5 diff --git a/qtsvg b/qtsvg index 7b88174eb38..d44607f07fa 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 7b88174eb38ab1da4cb54f52734a01c7440def0d +Subproject commit d44607f07fa66f0f5294c227eba99aac7c8dbebd diff --git a/qttools b/qttools index e089fe78e27..e8c3c391de1 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e089fe78e2745f8316cadaa7492ab442c203b18d +Subproject commit e8c3c391de17edce4542819c79de3d27a57ff408 diff --git a/qttranslations b/qttranslations index f7745c11704..40aabebd04a 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f7745c117041e7adf9705e1de8d71086c160dd9f +Subproject commit 40aabebd04a30ccef374bf20a7bfaa1d8d665b7f diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 8b885af5ad3..80565aa7fc3 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 8b885af5ad3c2f2ff500c060a41e312ea7276e50 +Subproject commit 80565aa7fc37ecdb1c08e585d4ae3060618e3338 diff --git a/qtwayland b/qtwayland index ec9fb19ead7..163ea1a04d1 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit ec9fb19ead796d88bb9a67a4ddd269870cbacb54 +Subproject commit 163ea1a04d1b00c95373d69e8c907e5789082d3e diff --git a/qtwebchannel b/qtwebchannel index 47af6a4db5b..d5eb0142112 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 47af6a4db5bc1faf3abf1152d7f0fdc2297387a1 +Subproject commit d5eb0142112b2b058e86489f7dae2e00c0aebe4c diff --git a/qtwebglplugin b/qtwebglplugin index 8f879e6bcf9..80257933d3b 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 8f879e6bcf941a612c568fbfe2b49ddb1bb409cd +Subproject commit 80257933d3bf3a026455d71106e6b3e70dead765 diff --git a/qtwebsockets b/qtwebsockets index 4a67d49f565..6edf8323d14 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 4a67d49f565b90a827f35a2b090e196afe9accec +Subproject commit 6edf8323d14c531b12d5e818aa5923ca411fe6bf diff --git a/qtwebview b/qtwebview index 53fa4470999..3d9289d73c5 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 53fa44709992faae54e4f5c8a128cea7b6f0cbd5 +Subproject commit 3d9289d73c5c03ed5b2fe246589d0d81cfdaa22e diff --git a/qtwinextras b/qtwinextras index ee931eba5d1..e6a85ae3306 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit ee931eba5d129284d5c33157cd7d0b9232fbee7b +Subproject commit e6a85ae3306867400b8700600152949656eb21f7 diff --git a/qtx11extras b/qtx11extras index aaa54153970..415ac0d5852 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit aaa54153970d1d63a44b873cad5f62ffa71ef9b8 +Subproject commit 415ac0d58521be2bb00ef4cecdb16f0b9001e88c diff --git a/qtxmlpatterns b/qtxmlpatterns index 6e0917d518e..eb59017f04b 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 6e0917d518e07f737cc663b8d632c8021634fd3b +Subproject commit eb59017f04b44667e0c6778aa3995f8e86c98e48 From e6c2b7b2641e6984b59b73df99684c14255710c3 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Fri, 24 May 2024 22:51:21 +0300 Subject: [PATCH 103/106] Merge Qt 5.15.14 opensource release Change-Id: I8f66072d46fb4e8e85411fd93bbc85a336e06f60 --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index 67bee4599a2..9bf4d03e251 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 67bee4599a28e1cadc14ed9ea4adc7061e250b90 +Subproject commit 9bf4d03e2515f7c454647d54542330b6e90f8191 diff --git a/qtactiveqt b/qtactiveqt index 014285857ef..91bfd21f86c 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 014285857ef1cfb2d9965cf7bad871bbc336ce60 +Subproject commit 91bfd21f86c450b129ac2dde9d33b32e140d8a0c diff --git a/qtandroidextras b/qtandroidextras index f4791ee1652..197a7e05cda 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit f4791ee16526505ec1527056c45e3c9d6b3c44b6 +Subproject commit 197a7e05cda87a4645f30c8ef5044b342442ebd1 diff --git a/qtbase b/qtbase index 4e158f6bfa7..86c62c8f608 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4e158f6bfa7d0747d8da70b3b15a44b52e35bb8a +Subproject commit 86c62c8f6088ec148512457cb7e964661ba643b0 diff --git a/qtcharts b/qtcharts index 3f3f14d69a5..7315c48bcec 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 3f3f14d69a509c3e8027bfb5d7ffca9b4f3ef003 +Subproject commit 7315c48bcec88014e78165bbda54abfcd557e0af diff --git a/qtconnectivity b/qtconnectivity index f1fed9fb2a7..e7db26441bd 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit f1fed9fb2a7e5b877d8408f92040651b0cf47dbb +Subproject commit e7db26441bd92d8e4aed9fa63f1cea7fd7ec2aec diff --git a/qtdatavis3d b/qtdatavis3d index 6ac6d23a8f5..79cd0fb6caf 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 6ac6d23a8f558f36f1162b419858cc44dccd4d2b +Subproject commit 79cd0fb6cafcd42e4037ae1363fda3bc2cec934a diff --git a/qtdeclarative b/qtdeclarative index 6ab9856ef37..5f4570b5164 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6ab9856ef379fc3fe44d5fac03a83f679f398511 +Subproject commit 5f4570b5164a828b20514b938957ce06b105ff3e diff --git a/qtdoc b/qtdoc index bebd32616d8..f25100675db 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit bebd32616d892368706e4ee80abfcfc094f31dc4 +Subproject commit f25100675dbf77be8e74490ca70038aefe9bbee2 diff --git a/qtgamepad b/qtgamepad index 44255e2ae53..b1c2f272f69 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 44255e2ae53a14e9a3fb671da0782ec5d396220a +Subproject commit b1c2f272f69e222a532485e6f820776c220b3535 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 895f9753940..2c39e673d6c 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 895f9753940156dda05aa83d3c7655571514407e +Subproject commit 2c39e673d6c15a84dcc7882d3772fa04cc79f9ed diff --git a/qtimageformats b/qtimageformats index 3c2ad3eed6f..ec0ce6808af 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 3c2ad3eed6fc522ad809797747c8028b3dd4778a +Subproject commit ec0ce6808af8e4626b6c7e2f6137c96c1fba8b9c diff --git a/qtlocation b/qtlocation index f6953a8d604..502f887603c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f6953a8d604b906b170fb4610e124e7c31260a18 +Subproject commit 502f887603c42e31555462f695e07bdff66e64e0 diff --git a/qtlottie b/qtlottie index 62f17bbc0ae..b8c1fa109dc 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 62f17bbc0ae8649178ac484afc434dbad16d6351 +Subproject commit b8c1fa109dce6f8bff9f55738d2f1e21ff677796 diff --git a/qtmacextras b/qtmacextras index 6ecba1864be..e66cba7cf02 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 6ecba1864bee0ed9de0897d10a260149d00683e2 +Subproject commit e66cba7cf02aa8aecce03540cd167621f2cda5f0 diff --git a/qtmultimedia b/qtmultimedia index 374d71e29a1..94d2d862bd6 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 374d71e29a142bd177cd5b1b7e29a4628085ddcb +Subproject commit 94d2d862bd6fd6d192a18272ffc465f873e74a69 diff --git a/qtnetworkauth b/qtnetworkauth index ed2291d454f..2e1b2358579 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit ed2291d454fac207f6b1555d30b9227e51be611b +Subproject commit 2e1b2358579fab91f6be722fbaea3beb7e68f790 diff --git a/qtpurchasing b/qtpurchasing index 7f4ead6f3e6..d4903bf08c5 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 7f4ead6f3e6431acee63987a0a1753ff140ac2d2 +Subproject commit d4903bf08c576a6c085278c1960a2676cd83dca7 diff --git a/qtquick3d b/qtquick3d index fbb8186383e..c1909714d0b 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit fbb8186383e7e3389b952c43781755346d5ce371 +Subproject commit c1909714d0bf1314470211808f729337a6a3b1a4 diff --git a/qtquickcontrols b/qtquickcontrols index 77fbfa8d313..9325659ec39 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 77fbfa8d313bbdb8fb762f15dd6173a067be55e3 +Subproject commit 9325659ec390eda5b160736a926ba58ccb445cce diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 480694ae720..d1037e0443c 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 480694ae720490b162747b07aa0e0bb7e7abc7da +Subproject commit d1037e0443c718bfd40e292c2df1e042c33615f4 diff --git a/qtquicktimeline b/qtquicktimeline index 29394e35db4..bf6c73064c8 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 29394e35db43acb20e7b4d5e978a733f5b4232a6 +Subproject commit bf6c73064c82b07fcb1f7e72c263b249e137e224 diff --git a/qtremoteobjects b/qtremoteobjects index 18ef1cdce7b..3873bdc809c 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 18ef1cdce7bc4c93415f38f1c220ab697aa75908 +Subproject commit 3873bdc809ca8d58d91968cb0de34da26646bc79 diff --git a/qtscxml b/qtscxml index 6074956c208..6834b183966 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 6074956c2089dd0507d2930c638fa8c930f4e21c +Subproject commit 6834b183966d08d9f061642ee7ea2d482cbbf073 diff --git a/qtsensors b/qtsensors index 7f8b55744f8..bf0b718cd0b 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 7f8b55744f87155a4979dd8ba405bd7feec03042 +Subproject commit bf0b718cd0b6c7823e9d2037d3bdece44185f444 diff --git a/qtserialbus b/qtserialbus index 5efce7d821b..616bc5b962c 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 5efce7d821bad2f5db95ff3ada5eeddccbb58920 +Subproject commit 616bc5b962cdcacb1c1ba985d7236392e9cadb8c diff --git a/qtserialport b/qtserialport index fc0b6affe24..34c19c6441c 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit fc0b6affe244e40366bd624d6e01c62712568eb8 +Subproject commit 34c19c6441cd440dc65b59ae7670eadf099d51f8 diff --git a/qtspeech b/qtspeech index 90e32fa6089..58048183ea4 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 90e32fa60897f223e80f3e78639c6ba9674c5ad5 +Subproject commit 58048183ea4438aff176b87ec520072c6e62167a diff --git a/qtsvg b/qtsvg index d44607f07fa..5b9caa97d1a 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit d44607f07fa66f0f5294c227eba99aac7c8dbebd +Subproject commit 5b9caa97d1a8d61c5301cc12cd8dd5aebdc62272 diff --git a/qttools b/qttools index e8c3c391de1..3cb9142cafa 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e8c3c391de17edce4542819c79de3d27a57ff408 +Subproject commit 3cb9142cafa3d5b39fd2020a79bfb4175721278e diff --git a/qttranslations b/qttranslations index 40aabebd04a..c601106c8b5 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 40aabebd04a30ccef374bf20a7bfaa1d8d665b7f +Subproject commit c601106c8b5d5495f951c8ea0ad6a9e171416ae0 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 80565aa7fc3..7389450a5de 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 80565aa7fc37ecdb1c08e585d4ae3060618e3338 +Subproject commit 7389450a5de5fdd210f1459abcf73621ec0496bd diff --git a/qtwayland b/qtwayland index 163ea1a04d1..8fbc3b59e19 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 163ea1a04d1b00c95373d69e8c907e5789082d3e +Subproject commit 8fbc3b59e19ebaec1343abbde2a10537bc240f84 diff --git a/qtwebchannel b/qtwebchannel index d5eb0142112..517568318cb 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit d5eb0142112b2b058e86489f7dae2e00c0aebe4c +Subproject commit 517568318cb191456010aa8d9c32ec83b84ab3ed diff --git a/qtwebglplugin b/qtwebglplugin index 80257933d3b..36813569042 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 80257933d3bf3a026455d71106e6b3e70dead765 +Subproject commit 3681356904277e055759693551357e7e488d1be9 diff --git a/qtwebsockets b/qtwebsockets index 6edf8323d14..6e9835488f5 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 6edf8323d14c531b12d5e818aa5923ca411fe6bf +Subproject commit 6e9835488f5140e172b206c8cb393f9c7a54aee8 diff --git a/qtwebview b/qtwebview index 3d9289d73c5..bbb1891595a 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 3d9289d73c5c03ed5b2fe246589d0d81cfdaa22e +Subproject commit bbb1891595aba23ff3c6d137aa74442f9e54479b diff --git a/qtwinextras b/qtwinextras index e6a85ae3306..907009a4f7e 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit e6a85ae3306867400b8700600152949656eb21f7 +Subproject commit 907009a4f7e5d2b99805547caf4b901bdbb0d4d6 diff --git a/qtx11extras b/qtx11extras index 415ac0d5852..6c3605fcb3b 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 415ac0d58521be2bb00ef4cecdb16f0b9001e88c +Subproject commit 6c3605fcb3b34e55951f597e06c135d97dfa6cd7 diff --git a/qtxmlpatterns b/qtxmlpatterns index eb59017f04b..087f6f35bd0 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit eb59017f04b44667e0c6778aa3995f8e86c98e48 +Subproject commit 087f6f35bd027f940818b1696d0aad822e034377 From e4ca9dfa716e7590d1a3014c65b05ac00781f980 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Fri, 30 Aug 2024 15:11:48 +0300 Subject: [PATCH 104/106] Merge Qt 5.15.15 opensource release Change-Id: I6cbd1e72b82857fac02f1bee866e20ff47b751d1 --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index 9bf4d03e251..84b2eae328f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9bf4d03e2515f7c454647d54542330b6e90f8191 +Subproject commit 84b2eae328fdff5d633af0a9563272c93f6ec074 diff --git a/qtactiveqt b/qtactiveqt index 91bfd21f86c..8f8e9fcc03f 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 91bfd21f86c450b129ac2dde9d33b32e140d8a0c +Subproject commit 8f8e9fcc03f506cf27b0bb090c5120eaa15c6e19 diff --git a/qtandroidextras b/qtandroidextras index 197a7e05cda..305cce86cb6 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 197a7e05cda87a4645f30c8ef5044b342442ebd1 +Subproject commit 305cce86cb62c0d2cac1209dd50f15caf2f21c2a diff --git a/qtbase b/qtbase index 86c62c8f608..ca725ad9c53 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 86c62c8f6088ec148512457cb7e964661ba643b0 +Subproject commit ca725ad9c5331a657c328bf624f2b0b713623276 diff --git a/qtcharts b/qtcharts index 7315c48bcec..0c97aae7dc2 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 7315c48bcec88014e78165bbda54abfcd557e0af +Subproject commit 0c97aae7dc242ac0710e09397672ad878761157a diff --git a/qtconnectivity b/qtconnectivity index e7db26441bd..b1f82067f25 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e7db26441bd92d8e4aed9fa63f1cea7fd7ec2aec +Subproject commit b1f82067f25242332bb9c9beabdf445bde2be203 diff --git a/qtdatavis3d b/qtdatavis3d index 79cd0fb6caf..e5c03e4431e 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 79cd0fb6cafcd42e4037ae1363fda3bc2cec934a +Subproject commit e5c03e4431eed6c4654c20fb2d2a20485cff522d diff --git a/qtdeclarative b/qtdeclarative index 5f4570b5164..7c32569ad27 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5f4570b5164a828b20514b938957ce06b105ff3e +Subproject commit 7c32569ad27b743b6cb50e2bcb67c9ca1674f238 diff --git a/qtdoc b/qtdoc index f25100675db..06eb4742b51 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f25100675dbf77be8e74490ca70038aefe9bbee2 +Subproject commit 06eb4742b5178596cfe2b78001cd8d99cd4379b1 diff --git a/qtgamepad b/qtgamepad index b1c2f272f69..e9109dadba5 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit b1c2f272f69e222a532485e6f820776c220b3535 +Subproject commit e9109dadba5c8f2419af67139106b4c30f90332e diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 2c39e673d6c..4d3d395d14d 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 2c39e673d6c15a84dcc7882d3772fa04cc79f9ed +Subproject commit 4d3d395d14d4a956ac5b30afa859321c1e1934e4 diff --git a/qtimageformats b/qtimageformats index ec0ce6808af..d833f0ec0d7 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit ec0ce6808af8e4626b6c7e2f6137c96c1fba8b9c +Subproject commit d833f0ec0d7a7c2ca26132ec2ff9c4225b1c5c10 diff --git a/qtlocation b/qtlocation index 502f887603c..8a9136b1a7d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 502f887603c42e31555462f695e07bdff66e64e0 +Subproject commit 8a9136b1a7d84147e33cf308aa008bb4691676a6 diff --git a/qtlottie b/qtlottie index b8c1fa109dc..bdbd77ef552 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit b8c1fa109dce6f8bff9f55738d2f1e21ff677796 +Subproject commit bdbd77ef5529b894699fe8d01642e75230e59f24 diff --git a/qtmacextras b/qtmacextras index e66cba7cf02..3ffd97b730f 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit e66cba7cf02aa8aecce03540cd167621f2cda5f0 +Subproject commit 3ffd97b730fb635e0ada0b5b6f4894a128286cb1 diff --git a/qtmultimedia b/qtmultimedia index 94d2d862bd6..c2bf5ac131a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 94d2d862bd6fd6d192a18272ffc465f873e74a69 +Subproject commit c2bf5ac131a834f7f45c4cfd5fd881866b28947f diff --git a/qtnetworkauth b/qtnetworkauth index 2e1b2358579..49384c945c0 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 2e1b2358579fab91f6be722fbaea3beb7e68f790 +Subproject commit 49384c945c09dee0c573bce3364a7cdd78c96c6d diff --git a/qtpurchasing b/qtpurchasing index d4903bf08c5..6922c0e403e 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit d4903bf08c576a6c085278c1960a2676cd83dca7 +Subproject commit 6922c0e403e94ac9c2336706bc3df1e2da217a1f diff --git a/qtquick3d b/qtquick3d index c1909714d0b..e864323e442 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit c1909714d0bf1314470211808f729337a6a3b1a4 +Subproject commit e864323e442415198cea996aa9b7d7386557765d diff --git a/qtquickcontrols b/qtquickcontrols index 9325659ec39..fe98f874f89 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 9325659ec390eda5b160736a926ba58ccb445cce +Subproject commit fe98f874f89abe9b96edadb812cfa9b1488679f0 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d1037e0443c..8bd980bac3b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d1037e0443c718bfd40e292c2df1e042c33615f4 +Subproject commit 8bd980bac3b778caf7f52ddc1464db93335c6429 diff --git a/qtquicktimeline b/qtquicktimeline index bf6c73064c8..a0a95b50f24 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit bf6c73064c82b07fcb1f7e72c263b249e137e224 +Subproject commit a0a95b50f2477823f9400b07e76e516555f16dc0 diff --git a/qtremoteobjects b/qtremoteobjects index 3873bdc809c..289bbabdff2 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 3873bdc809ca8d58d91968cb0de34da26646bc79 +Subproject commit 289bbabdff28b4362351f3d91abf75130c9cf666 diff --git a/qtscxml b/qtscxml index 6834b183966..02e1e963ec9 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 6834b183966d08d9f061642ee7ea2d482cbbf073 +Subproject commit 02e1e963ec9492bb1620b3ac3fc6ffc2ff280778 diff --git a/qtsensors b/qtsensors index bf0b718cd0b..b97c60bee75 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit bf0b718cd0b6c7823e9d2037d3bdece44185f444 +Subproject commit b97c60bee7505eb3901579abc4751f35ba7b303e diff --git a/qtserialbus b/qtserialbus index 616bc5b962c..77dae896b13 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 616bc5b962cdcacb1c1ba985d7236392e9cadb8c +Subproject commit 77dae896b13e36969fefdfa25d711e455d58597b diff --git a/qtserialport b/qtserialport index 34c19c6441c..aa2ffdbd729 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 34c19c6441cd440dc65b59ae7670eadf099d51f8 +Subproject commit aa2ffdbd7295db9e5814070d1432a0b77c59cfce diff --git a/qtspeech b/qtspeech index 58048183ea4..e07c851690c 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 58048183ea4438aff176b87ec520072c6e62167a +Subproject commit e07c851690cf1daf9e06826264d96827091f85d5 diff --git a/qtsvg b/qtsvg index 5b9caa97d1a..5eef2ef87ce 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 5b9caa97d1a8d61c5301cc12cd8dd5aebdc62272 +Subproject commit 5eef2ef87ce2f9434ce602ec1b7c2494ae705ad3 diff --git a/qttools b/qttools index 3cb9142cafa..d438130ec83 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 3cb9142cafa3d5b39fd2020a79bfb4175721278e +Subproject commit d438130ec83b23e6840ff45dd7db55c065e3c2c3 diff --git a/qttranslations b/qttranslations index c601106c8b5..07ae7ea7c94 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c601106c8b5d5495f951c8ea0ad6a9e171416ae0 +Subproject commit 07ae7ea7c94225e73c8eddc9f3f89edc863e83e0 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 7389450a5de..e62c1219cae 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 7389450a5de5fdd210f1459abcf73621ec0496bd +Subproject commit e62c1219caef25182ba85383834be04eefce12bf diff --git a/qtwayland b/qtwayland index 8fbc3b59e19..826dcefebc6 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8fbc3b59e19ebaec1343abbde2a10537bc240f84 +Subproject commit 826dcefebc61eb260ef89f013a474d635c6abb18 diff --git a/qtwebchannel b/qtwebchannel index 517568318cb..a8980b1331e 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 517568318cb191456010aa8d9c32ec83b84ab3ed +Subproject commit a8980b1331e5fddcb3c5d843add898306d076662 diff --git a/qtwebglplugin b/qtwebglplugin index 36813569042..0d29f1cd463 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 3681356904277e055759693551357e7e488d1be9 +Subproject commit 0d29f1cd46331caf1b5169eb037d573680454348 diff --git a/qtwebsockets b/qtwebsockets index 6e9835488f5..2c9ab820248 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 6e9835488f5140e172b206c8cb393f9c7a54aee8 +Subproject commit 2c9ab820248797b98439c4db651c0a80f015b146 diff --git a/qtwebview b/qtwebview index bbb1891595a..70030514bda 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit bbb1891595aba23ff3c6d137aa74442f9e54479b +Subproject commit 70030514bdaf993517556209503075db15bd1c61 diff --git a/qtwinextras b/qtwinextras index 907009a4f7e..e1773a91723 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 907009a4f7e5d2b99805547caf4b901bdbb0d4d6 +Subproject commit e1773a917239c5b548ebd9e2ab34a687ffb949e4 diff --git a/qtx11extras b/qtx11extras index 6c3605fcb3b..ff2cc0065a3 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 6c3605fcb3b34e55951f597e06c135d97dfa6cd7 +Subproject commit ff2cc0065a3504e6043b47b1b4601fcdce62eefb diff --git a/qtxmlpatterns b/qtxmlpatterns index 087f6f35bd0..330c47bab83 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 087f6f35bd027f940818b1696d0aad822e034377 +Subproject commit 330c47bab8333d6dc7d4ab838afb81f29b6a32d0 From a3229832677a474040fae017a35929f6f110336e Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Sat, 16 Nov 2024 14:19:30 +0200 Subject: [PATCH 105/106] Merge Qt 5.15.16 opensource release Change-Id: I5298e168f837796fc223b6c51464c37adda74df7 --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index 84b2eae328f..1eecf07a4d5 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 84b2eae328fdff5d633af0a9563272c93f6ec074 +Subproject commit 1eecf07a4d5dadd1b5aaf785fc2a5ed03565599d diff --git a/qtactiveqt b/qtactiveqt index 8f8e9fcc03f..57ffe4b2b86 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 8f8e9fcc03f506cf27b0bb090c5120eaa15c6e19 +Subproject commit 57ffe4b2b86854c60d85c263fde9a56a891b578e diff --git a/qtandroidextras b/qtandroidextras index 305cce86cb6..abe5958ccfb 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 305cce86cb62c0d2cac1209dd50f15caf2f21c2a +Subproject commit abe5958ccfb1741daf37bb135aa6b90ef6c35b21 diff --git a/qtbase b/qtbase index ca725ad9c53..8ad94db9385 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ca725ad9c5331a657c328bf624f2b0b713623276 +Subproject commit 8ad94db938533e1b7a96f9baddffbcdbae6909d3 diff --git a/qtcharts b/qtcharts index 0c97aae7dc2..4e4fc559c61 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 0c97aae7dc242ac0710e09397672ad878761157a +Subproject commit 4e4fc559c61d1fc2542add48d2b3c490214e9936 diff --git a/qtconnectivity b/qtconnectivity index b1f82067f25..b242dc4fd4b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b1f82067f25242332bb9c9beabdf445bde2be203 +Subproject commit b242dc4fd4bd68809872d8c1d6c1e63825692893 diff --git a/qtdatavis3d b/qtdatavis3d index e5c03e4431e..db75c351cd0 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit e5c03e4431eed6c4654c20fb2d2a20485cff522d +Subproject commit db75c351cd0c2b93016ca489ffb9db806e6fd6e9 diff --git a/qtdeclarative b/qtdeclarative index 7c32569ad27..abe4729ea8d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7c32569ad27b743b6cb50e2bcb67c9ca1674f238 +Subproject commit abe4729ea8db32124c36dc33fc32eb629df03043 diff --git a/qtdoc b/qtdoc index 06eb4742b51..2653ffbbd41 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 06eb4742b5178596cfe2b78001cd8d99cd4379b1 +Subproject commit 2653ffbbd41d3020f3358bf76b01ee6eba587530 diff --git a/qtgamepad b/qtgamepad index e9109dadba5..4a0bc806872 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit e9109dadba5c8f2419af67139106b4c30f90332e +Subproject commit 4a0bc8068728e18d0cb49cfb1c34c2931b2f05e5 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 4d3d395d14d..d6ef4931b29 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 4d3d395d14d4a956ac5b30afa859321c1e1934e4 +Subproject commit d6ef4931b295881becd2ff37b301a0115f14618e diff --git a/qtimageformats b/qtimageformats index d833f0ec0d7..a9636f960a7 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d833f0ec0d7a7c2ca26132ec2ff9c4225b1c5c10 +Subproject commit a9636f960a7b77ec496bf0d456a846d452784bba diff --git a/qtlocation b/qtlocation index 8a9136b1a7d..2bcec6f629d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8a9136b1a7d84147e33cf308aa008bb4691676a6 +Subproject commit 2bcec6f629de7a504bac6c742114e95eb00ed721 diff --git a/qtlottie b/qtlottie index bdbd77ef552..f5984b138b8 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit bdbd77ef5529b894699fe8d01642e75230e59f24 +Subproject commit f5984b138b8d1da6940d48fc1fe0e4cac068ff1c diff --git a/qtmacextras b/qtmacextras index 3ffd97b730f..acf76f52fa9 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 3ffd97b730fb635e0ada0b5b6f4894a128286cb1 +Subproject commit acf76f52fa9cc919303c41f763f158c94bcd5189 diff --git a/qtmultimedia b/qtmultimedia index c2bf5ac131a..5dc0ed6f505 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c2bf5ac131a834f7f45c4cfd5fd881866b28947f +Subproject commit 5dc0ed6f5059b6ab81c3009cf72797a36ec5b211 diff --git a/qtnetworkauth b/qtnetworkauth index 49384c945c0..b7cb0184f4f 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 49384c945c09dee0c573bce3364a7cdd78c96c6d +Subproject commit b7cb0184f4f7d45f1e711a4ab5a1b54817402f98 diff --git a/qtpurchasing b/qtpurchasing index 6922c0e403e..e15e0b0fd49 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 6922c0e403e94ac9c2336706bc3df1e2da217a1f +Subproject commit e15e0b0fd495bd708f740df754fa45917fcb3fb9 diff --git a/qtquick3d b/qtquick3d index e864323e442..336052efe18 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit e864323e442415198cea996aa9b7d7386557765d +Subproject commit 336052efe1873f31572ef4701140323066c57766 diff --git a/qtquickcontrols b/qtquickcontrols index fe98f874f89..c0edbd15755 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit fe98f874f89abe9b96edadb812cfa9b1488679f0 +Subproject commit c0edbd157555ae4d87082f7e786787dabb1f9873 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 8bd980bac3b..3e790bf29af 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 8bd980bac3b778caf7f52ddc1464db93335c6429 +Subproject commit 3e790bf29afbc46ee6093685f26fb80474c5268d diff --git a/qtquicktimeline b/qtquicktimeline index a0a95b50f24..a5bbd4ad399 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit a0a95b50f2477823f9400b07e76e516555f16dc0 +Subproject commit a5bbd4ad3997e812a18ee89973317fd04d169b0a diff --git a/qtremoteobjects b/qtremoteobjects index 289bbabdff2..aa61cc68397 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 289bbabdff28b4362351f3d91abf75130c9cf666 +Subproject commit aa61cc683979ea1413222e64a03aae9971392e3d diff --git a/qtscxml b/qtscxml index 02e1e963ec9..64398dfca74 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 02e1e963ec9492bb1620b3ac3fc6ffc2ff280778 +Subproject commit 64398dfca74a6d4c37d51b56ecfcd1d7ccb6e533 diff --git a/qtsensors b/qtsensors index b97c60bee75..55398471a3b 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit b97c60bee7505eb3901579abc4751f35ba7b303e +Subproject commit 55398471a3b46db2727b462776c137bced1dfdd6 diff --git a/qtserialbus b/qtserialbus index 77dae896b13..9dfba421ded 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 77dae896b13e36969fefdfa25d711e455d58597b +Subproject commit 9dfba421ded501fd0016728b381df3b7166280ec diff --git a/qtserialport b/qtserialport index aa2ffdbd729..875adfdf3ca 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit aa2ffdbd7295db9e5814070d1432a0b77c59cfce +Subproject commit 875adfdf3ca8f1059fdd3c5fd20baaa00694a2e7 diff --git a/qtspeech b/qtspeech index e07c851690c..5e253d1e2fe 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit e07c851690cf1daf9e06826264d96827091f85d5 +Subproject commit 5e253d1e2feb67d3ac7c630984bad368e27e39a9 diff --git a/qtsvg b/qtsvg index 5eef2ef87ce..ba3671e467d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 5eef2ef87ce2f9434ce602ec1b7c2494ae705ad3 +Subproject commit ba3671e467d952f9d47649654082143582984e1d diff --git a/qttools b/qttools index d438130ec83..62998610cf3 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d438130ec83b23e6840ff45dd7db55c065e3c2c3 +Subproject commit 62998610cf31868b54cf4d4ffdd002f769da0b96 diff --git a/qttranslations b/qttranslations index 07ae7ea7c94..56f5bf5a27d 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 07ae7ea7c94225e73c8eddc9f3f89edc863e83e0 +Subproject commit 56f5bf5a27db344e62d74bd5d2d54060e4b81fa2 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index e62c1219cae..365f79ee89c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit e62c1219caef25182ba85383834be04eefce12bf +Subproject commit 365f79ee89c6a57f205fe6c89817c51ff52ea059 diff --git a/qtwayland b/qtwayland index 826dcefebc6..7558876d0fc 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 826dcefebc61eb260ef89f013a474d635c6abb18 +Subproject commit 7558876d0fca798be4371c0a2a448a478f74a187 diff --git a/qtwebchannel b/qtwebchannel index a8980b1331e..b292c6536d5 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit a8980b1331e5fddcb3c5d843add898306d076662 +Subproject commit b292c6536d5839f535e7b6413eb6e6d2c9cb47f7 diff --git a/qtwebglplugin b/qtwebglplugin index 0d29f1cd463..64efc679e52 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 0d29f1cd46331caf1b5169eb037d573680454348 +Subproject commit 64efc679e520505be352f2b3ad662184ef265503 diff --git a/qtwebsockets b/qtwebsockets index 2c9ab820248..e1f9a1a1ead 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 2c9ab820248797b98439c4db651c0a80f015b146 +Subproject commit e1f9a1a1ead82b80bac3ba8acdd2c2568f407392 diff --git a/qtwebview b/qtwebview index 70030514bda..e3de9fef155 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 70030514bdaf993517556209503075db15bd1c61 +Subproject commit e3de9fef1557d4a5bac4c9fe42b399df34502c9f diff --git a/qtwinextras b/qtwinextras index e1773a91723..56cbbfad338 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit e1773a917239c5b548ebd9e2ab34a687ffb949e4 +Subproject commit 56cbbfad338183d764868dd8c5a271d542280751 diff --git a/qtx11extras b/qtx11extras index ff2cc0065a3..0c61151bf14 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit ff2cc0065a3504e6043b47b1b4601fcdce62eefb +Subproject commit 0c61151bf14e5b4c74187608b6b47b9d0d6ca745 diff --git a/qtxmlpatterns b/qtxmlpatterns index 330c47bab83..43996a4e543 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 330c47bab8333d6dc7d4ab838afb81f29b6a32d0 +Subproject commit 43996a4e543fa22b345c03ba3a1a41b1aba4b454 From 511a466f0924dfe55816106cbdae34a473fe60aa Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Tue, 20 May 2025 12:10:20 +0300 Subject: [PATCH 106/106] Merge Qt 5.15.17 opensource release Change-Id: If36c1537ec7eb70133a420b7381a29daf39c680e --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index 1eecf07a4d5..73c1dda553f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 1eecf07a4d5dadd1b5aaf785fc2a5ed03565599d +Subproject commit 73c1dda553f338c5a3b9ebbfd0e7de114f0c93dc diff --git a/qtactiveqt b/qtactiveqt index 57ffe4b2b86..df401a62879 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 57ffe4b2b86854c60d85c263fde9a56a891b578e +Subproject commit df401a62879521f3fd47097205a440d5b173b524 diff --git a/qtandroidextras b/qtandroidextras index abe5958ccfb..484bbac0978 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit abe5958ccfb1741daf37bb135aa6b90ef6c35b21 +Subproject commit 484bbac0978eccc9031cbf1bf804a81a6bfb1247 diff --git a/qtbase b/qtbase index 8ad94db9385..5e8b3ee0ae8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8ad94db938533e1b7a96f9baddffbcdbae6909d3 +Subproject commit 5e8b3ee0ae8cabf3c1a84d4568ff5f9f2bb09544 diff --git a/qtcharts b/qtcharts index 4e4fc559c61..aaf04515611 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 4e4fc559c61d1fc2542add48d2b3c490214e9936 +Subproject commit aaf04515611203a32cef866cce9bfeaa4cef20b6 diff --git a/qtconnectivity b/qtconnectivity index b242dc4fd4b..e8de014972f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b242dc4fd4bd68809872d8c1d6c1e63825692893 +Subproject commit e8de014972fc254c1125a4da24597009f2f6cc68 diff --git a/qtdatavis3d b/qtdatavis3d index db75c351cd0..a57e633b675 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit db75c351cd0c2b93016ca489ffb9db806e6fd6e9 +Subproject commit a57e633b675d7886c3e5c64441f50ffe831f2de8 diff --git a/qtdeclarative b/qtdeclarative index abe4729ea8d..de625ea60fa 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit abe4729ea8db32124c36dc33fc32eb629df03043 +Subproject commit de625ea60fa8eb030c3348710a96b37f2281ae0f diff --git a/qtdoc b/qtdoc index 2653ffbbd41..749b0d22214 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2653ffbbd41d3020f3358bf76b01ee6eba587530 +Subproject commit 749b0d222146b50bd209d34a5bb298333b56af33 diff --git a/qtgamepad b/qtgamepad index 4a0bc806872..fb2191db077 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 4a0bc8068728e18d0cb49cfb1c34c2931b2f05e5 +Subproject commit fb2191db07738c9a954a77c2fb15dcb925a4c361 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index d6ef4931b29..fed60f95ddb 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit d6ef4931b295881becd2ff37b301a0115f14618e +Subproject commit fed60f95ddb75103f83cf67bf2c9f471e49576fe diff --git a/qtimageformats b/qtimageformats index a9636f960a7..a8700e75852 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit a9636f960a7b77ec496bf0d456a846d452784bba +Subproject commit a8700e758525336c1331165efb68a3f24dd7a6e7 diff --git a/qtlocation b/qtlocation index 2bcec6f629d..a503f6a28ed 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 2bcec6f629de7a504bac6c742114e95eb00ed721 +Subproject commit a503f6a28ed5faeb444ff2d1c56e058f05f3e1a7 diff --git a/qtlottie b/qtlottie index f5984b138b8..76bc48eedf6 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit f5984b138b8d1da6940d48fc1fe0e4cac068ff1c +Subproject commit 76bc48eedf60c5f98ff9eb378fc8ce16b053bc32 diff --git a/qtmacextras b/qtmacextras index acf76f52fa9..4ebefe8d375 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit acf76f52fa9cc919303c41f763f158c94bcd5189 +Subproject commit 4ebefe8d375054d2244ad7197868cb004c5f99d5 diff --git a/qtmultimedia b/qtmultimedia index 5dc0ed6f505..09dfcd32f02 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5dc0ed6f5059b6ab81c3009cf72797a36ec5b211 +Subproject commit 09dfcd32f0255d6844a6bc16a1ddb9fd5bacdb7b diff --git a/qtnetworkauth b/qtnetworkauth index b7cb0184f4f..2653044915b 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit b7cb0184f4f7d45f1e711a4ab5a1b54817402f98 +Subproject commit 2653044915b3fb1941aa0f8b25af50343efcbff7 diff --git a/qtpurchasing b/qtpurchasing index e15e0b0fd49..062778d6f80 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit e15e0b0fd495bd708f740df754fa45917fcb3fb9 +Subproject commit 062778d6f80df1ba45b8697720eb781bd477c292 diff --git a/qtquick3d b/qtquick3d index 336052efe18..366aaaf4965 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 336052efe1873f31572ef4701140323066c57766 +Subproject commit 366aaaf49650908b85779462c42e60885d796e8e diff --git a/qtquickcontrols b/qtquickcontrols index c0edbd15755..37ee5e07e82 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit c0edbd157555ae4d87082f7e786787dabb1f9873 +Subproject commit 37ee5e07e82296e24cc02c8bf6f31cb6bd8846b1 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 3e790bf29af..b59cc643e42 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 3e790bf29afbc46ee6093685f26fb80474c5268d +Subproject commit b59cc643e4234f84ba7785c3f96a4394bcdc0995 diff --git a/qtquicktimeline b/qtquicktimeline index a5bbd4ad399..c4f13dd78d6 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit a5bbd4ad3997e812a18ee89973317fd04d169b0a +Subproject commit c4f13dd78d6cf2df83335ad0328b892ce4b2ef70 diff --git a/qtremoteobjects b/qtremoteobjects index aa61cc68397..e060a099038 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit aa61cc683979ea1413222e64a03aae9971392e3d +Subproject commit e060a0990380134c054bde675d47db048fd3192f diff --git a/qtscxml b/qtscxml index 64398dfca74..2b7b1923967 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 64398dfca74a6d4c37d51b56ecfcd1d7ccb6e533 +Subproject commit 2b7b19239671784fbf79d6dbc0e985da044ff9dd diff --git a/qtsensors b/qtsensors index 55398471a3b..79ed5db98f3 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 55398471a3b46db2727b462776c137bced1dfdd6 +Subproject commit 79ed5db98f36b8ca70b077edef46fc793debb3ab diff --git a/qtserialbus b/qtserialbus index 9dfba421ded..971adee604b 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 9dfba421ded501fd0016728b381df3b7166280ec +Subproject commit 971adee604b772d79686126fe8b1e333824f67dc diff --git a/qtserialport b/qtserialport index 875adfdf3ca..9bb2b662594 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 875adfdf3ca8f1059fdd3c5fd20baaa00694a2e7 +Subproject commit 9bb2b66259413ac4eda1ddf64209ef44412aa55d diff --git a/qtspeech b/qtspeech index 5e253d1e2fe..5373a091a44 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 5e253d1e2feb67d3ac7c630984bad368e27e39a9 +Subproject commit 5373a091a44d845e3199987b235573dfd1e1fcdb diff --git a/qtsvg b/qtsvg index ba3671e467d..a9e1b419965 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit ba3671e467d952f9d47649654082143582984e1d +Subproject commit a9e1b4199654547e633730522d1b18168eb3e63a diff --git a/qttools b/qttools index 62998610cf3..1db38dc7d01 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 62998610cf31868b54cf4d4ffdd002f769da0b96 +Subproject commit 1db38dc7d01e2b0567fc6d92c7aa58bfe69ce9c3 diff --git a/qttranslations b/qttranslations index 56f5bf5a27d..fd567a42c1b 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 56f5bf5a27db344e62d74bd5d2d54060e4b81fa2 +Subproject commit fd567a42c1b566f22f339db758d29925fd2a8c60 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 365f79ee89c..0d229d587e5 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 365f79ee89c6a57f205fe6c89817c51ff52ea059 +Subproject commit 0d229d587e578fb4a5144594b926d5d3138c407e diff --git a/qtwayland b/qtwayland index 7558876d0fc..26d0b4202b9 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7558876d0fca798be4371c0a2a448a478f74a187 +Subproject commit 26d0b4202b9d81527138ce614573e0bc3b528b9d diff --git a/qtwebchannel b/qtwebchannel index b292c6536d5..a5b7afd2810 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit b292c6536d5839f535e7b6413eb6e6d2c9cb47f7 +Subproject commit a5b7afd2810b6547439a4403d4c00af1dab15425 diff --git a/qtwebglplugin b/qtwebglplugin index 64efc679e52..adb24841f9f 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 64efc679e520505be352f2b3ad662184ef265503 +Subproject commit adb24841f9fc2eea94f1d2636070411fcb6254b4 diff --git a/qtwebsockets b/qtwebsockets index e1f9a1a1ead..038b31686f8 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit e1f9a1a1ead82b80bac3ba8acdd2c2568f407392 +Subproject commit 038b31686f8af1a6964a760ad05dbf1f435c4c2c diff --git a/qtwebview b/qtwebview index e3de9fef155..f16dadb6d14 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit e3de9fef1557d4a5bac4c9fe42b399df34502c9f +Subproject commit f16dadb6d147c46565537ede46518a352cdd87c9 diff --git a/qtwinextras b/qtwinextras index 56cbbfad338..03d72f7b7df 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 56cbbfad338183d764868dd8c5a271d542280751 +Subproject commit 03d72f7b7df7892024f7a5a380305ad0347c1141 diff --git a/qtx11extras b/qtx11extras index 0c61151bf14..e6e7633bbd0 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 0c61151bf14e5b4c74187608b6b47b9d0d6ca745 +Subproject commit e6e7633bbd0efcc56035fef77f3f45efccf03a64 diff --git a/qtxmlpatterns b/qtxmlpatterns index 43996a4e543..e6455379104 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 43996a4e543fa22b345c03ba3a1a41b1aba4b454 +Subproject commit e645537910450ba8bf5ecfbb735f69acdeeef046