From 1f510d9514890a0d7da4a30762299f1aaf75f4d4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 11 May 2018 03:01:11 +0300 Subject: [PATCH 01/27] Update submodules on '5.11' in qt5 Change-Id: I0bbfab039743e644b1acf3321bb900c4ad8a43f1 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qttools | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index fae53562..68e6d64f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fae53562ae23ac99621c1987522015c0da59e374 +Subproject commit 68e6d64fe36511d0d9d8004e7fc1c36bf6c26ed2 diff --git a/qtdeclarative b/qtdeclarative index accc75e0..bd76d453 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit accc75e06e6fd65b166df994ec52fecd5b8c3f2f +Subproject commit bd76d453a9c365394ba339280f9adb2d107c381b diff --git a/qtlocation b/qtlocation index cad3ffc8..6feb47da 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit cad3ffc8c90f3c194d06e52c981cd54cdab509ec +Subproject commit 6feb47da8cf90bd0ad7ed406b88706c65690b880 diff --git a/qttools b/qttools index 36c5496a..7a3cda81 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 36c5496ac198891eea52e5a2bb779d8ccda93e68 +Subproject commit 7a3cda81ac1103afbe0224006fedd2f7f10b1ab6 From 36e5f25e563b41216655721e549ecec3eb67a003 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 14 May 2018 03:01:12 +0300 Subject: [PATCH 02/27] Update submodules on '5.11' in qt5 Change-Id: Ia5f7391624235fe85ba4ee591ff7a9dacc380a61 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtserialbus | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 68e6d64f..8c029e98 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 68e6d64fe36511d0d9d8004e7fc1c36bf6c26ed2 +Subproject commit 8c029e98bf668725979424766c0bbbfc012448b3 diff --git a/qtdeclarative b/qtdeclarative index bd76d453..28d849c0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bd76d453a9c365394ba339280f9adb2d107c381b +Subproject commit 28d849c059dfe6bf957cb1fe46e66815c87d50e9 diff --git a/qtmultimedia b/qtmultimedia index 075aa60b..14a77698 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 075aa60b0ff37300c7ed2cb07372d2c747cd6dfc +Subproject commit 14a77698a01782f27e395bbc8694b808455d4ba1 diff --git a/qtserialbus b/qtserialbus index 9e98521e..3fc0d45a 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 9e98521e3dfd2d96d5e0e160b74bb7059aa59dee +Subproject commit 3fc0d45a57181366cd4caf84c87c8467c5a326db From d75411d6e560fcec1ab36395e88b1baf26c4cb69 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 14 May 2018 11:06:05 +0200 Subject: [PATCH 03/27] Fix linking of qdoc against an external libclang (part 1) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is the qt5 part of the fix for the task. For the special version of libclang we hacked together that allows static linkage, set an environment variable that the mighty qdoc build system can utilize to activate the release packaging specific linkage. Change-Id: Ie340955214585329fe8fd3bc790e3cd6c6be42f9 Task-number: QTBUG-68178 Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/unix/libclang.sh | 7 +++++++ coin/provisioning/common/windows/libclang.ps1 | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 53b9dfda..900671e6 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -41,6 +41,7 @@ set -e source "${BASH_SOURCE%/*}/check_and_set_proxy.sh" +source "${BASH_SOURCE%/*}/SetEnvVar.sh" BASEDIR=$(dirname "$0") . $BASEDIR/../shared/sw_versions.txt @@ -68,3 +69,9 @@ sudo mv /tmp/libclang $destination echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile echo "libClang = $version" >> ~/versions.txt + +if [ "$version" == "6.0" ]; then + # This is a hacked static build of libclang which requires special + # handling on the qdoc side. + SetEnvVar "QDOC_USE_STATIC_LIBCLANG" "1" +fi diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 5ba0a0aa..db277134 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -86,3 +86,9 @@ if ( $setDefault ) { } Set-EnvironmentVariable ("LLVM_INSTALL_DIR_" + $toolchainSuffix) ($baseDestination + "-_ARCH_") Write-Output "libClang = $libclang_version" >> ~/versions.txt + +if ( $libclang_version -eq "60" ) { + # This is a hacked static build of libclang which requires special + # handling on the qdoc side. + Set-EnvironmentVariable "QDOC_USE_STATIC_LIBCLANG" "1" +} From 1c8ff381be103c91f552bd461b794cbf1a590f98 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 8 May 2018 15:04:38 +0300 Subject: [PATCH 04/27] Change QNX7 x86 release builds to x86_64 Task-number: QTBUG-67746 Change-Id: I677019909d56d8b227f0607069cbf3ab0cf7fec3 Reviewed-by: Jani Heikkinen --- coin/platform_configs/qt5.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index ddcd2d97..ae1f98ae 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -17,6 +17,6 @@ qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAnd qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker From d7b03bf0bcc501ba12c61a2a5ed2dfb02e2b80b5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 15 May 2018 06:10:15 +0300 Subject: [PATCH 05/27] Update submodules on '5.11.0' in qt5 Change-Id: I13dae70cd516b623c9e9039a6c8b71de84e88459 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdoc | 2 +- qttools | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index a7863a58..6eef81ee 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a7863a58545a6c59eaf16f36905efcbf0e4f94f9 +Subproject commit 6eef81ee1c82f934e14d47047d8b6103b8755321 diff --git a/qtdoc b/qtdoc index 63f18077..8a0244d3 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 63f18077b2e8b4045c92248e86ed1ee2122cbd75 +Subproject commit 8a0244d3f46c1eb9904d9da7e741bb2e05ca3f3d diff --git a/qttools b/qttools index 9894e604..36e7b192 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9894e604dff2bf9fe9961b475a678938316154f1 +Subproject commit 36e7b1925e2ff2df167280eb3592b99697a1234d From 426708026ecf4f1b10bfd884ea0ba15c952beedd Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 15 May 2018 03:01:42 +0300 Subject: [PATCH 06/27] Update submodules on '5.11' in qt5 Change-Id: Ia95638ce97e677ceeb0bfd85b287735b6027eeb6 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtx11extras | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 8c029e98..f148580e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8c029e98bf668725979424766c0bbbfc012448b3 +Subproject commit f148580e7299a68ca5aa50cba7fbcd098f8e907f diff --git a/qtdeclarative b/qtdeclarative index 28d849c0..9ef0d2da 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 28d849c059dfe6bf957cb1fe46e66815c87d50e9 +Subproject commit 9ef0d2da99f4593d50c16912d00bef121bb76f9b diff --git a/qtlocation b/qtlocation index 6feb47da..be74f55d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6feb47da8cf90bd0ad7ed406b88706c65690b880 +Subproject commit be74f55d065f45f4aaa5d5c9c101955801ac3092 diff --git a/qtmultimedia b/qtmultimedia index 14a77698..d2786da7 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 14a77698a01782f27e395bbc8694b808455d4ba1 +Subproject commit d2786da7143b4dc7a7e6ee2e4ba6af9e2efdafe5 diff --git a/qtwayland b/qtwayland index bb02115f..03e1c35a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit bb02115ff1c23289264b077d7d24b723fd9d339a +Subproject commit 03e1c35ab6a4395db3c7b71dd0bdd9a1956f7272 diff --git a/qtwebchannel b/qtwebchannel index 83eab9fd..dff78566 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 83eab9fd3cf3745340b18db961fcec45f4f80195 +Subproject commit dff78566654e47b22fd93d6c288c29fed4a742fe diff --git a/qtx11extras b/qtx11extras index 5650412f..335d9f25 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 5650412fee0a3b96936330eba4b3f1c0fa5dae41 +Subproject commit 335d9f2513bea8dc6ef8e7d3c07f0d288dd7f658 From e7a999ce4d2c6c1b7833dc50d1186ee4bfe642b9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 16 May 2018 12:12:10 +0300 Subject: [PATCH 07/27] Update submodules on '5.11.0' in qt5 Change-Id: I4de0d56b6bd15782984f67e4107b7ec9a90731e4 Reviewed-by: Jani Heikkinen --- qtqa | 2 +- qttools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtqa b/qtqa index 46daf8aa..79f009af 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 46daf8aac235107d0c77fe3a887ecb73f85b4159 +Subproject commit 79f009afd8ee0ad1c032f2235e09971ac1b5c376 diff --git a/qttools b/qttools index 36e7b192..a42d3f2a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 36e7b1925e2ff2df167280eb3592b99697a1234d +Subproject commit a42d3f2ac4b910ecc910ff144191cb729a745c9a From 081601ba0e368dc99c5dc0333b65584764f43fc9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 16 May 2018 17:32:03 +0300 Subject: [PATCH 08/27] Update submodules on '5.11.0' in qt5 Change-Id: Ibd0c5cf8c72518bd5bb608dfe3c7946f6bc2d121 Reviewed-by: Jani Heikkinen --- qtdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtdoc b/qtdoc index 8a0244d3..0d097a69 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8a0244d3f46c1eb9904d9da7e741bb2e05ca3f3d +Subproject commit 0d097a6995be7498b67b1586f8b2ebdc2cef26a3 From 9cc1220a43872f831fc3506c205033ba1013e3b9 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 16 May 2018 16:48:12 +0200 Subject: [PATCH 09/27] Update submodules on '5.11' in qt5 Change-Id: Ib08b9121da4235621876f41686f2715f01db0b30 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 66feeb8d..9c889c7b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 66feeb8de70291786499b3008ab8fded4043172a +Subproject commit 9c889c7be3b45a1fe21dbd8d134efc4402ff6d16 diff --git a/qtbase b/qtbase index f148580e..410b9435 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f148580e7299a68ca5aa50cba7fbcd098f8e907f +Subproject commit 410b94351663a4ce12a2cad9c9a5d28fc6dfd5e4 diff --git a/qtconnectivity b/qtconnectivity index f4157c60..88207ae8 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit f4157c6062f06c453fcf59d54c1bfd649ce45fab +Subproject commit 88207ae868002f0b53151d2c5c2ac416284ce9c1 diff --git a/qtdeclarative b/qtdeclarative index 9ef0d2da..710f9507 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9ef0d2da99f4593d50c16912d00bef121bb76f9b +Subproject commit 710f9507c0ebf01d9e9f717e676b9c3b1b94ee8a diff --git a/qtlocation b/qtlocation index be74f55d..d4702774 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit be74f55d065f45f4aaa5d5c9c101955801ac3092 +Subproject commit d4702774718a64e6190a786bab03fcbedddbc14d diff --git a/qtquickcontrols b/qtquickcontrols index b4ba5d36..0c40c9da 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b4ba5d36f46c61af4f8f6cdf07246fb5a63aedb5 +Subproject commit 0c40c9dae7c944bbf48c00c32a046a879fa0e7ac diff --git a/qtwebengine b/qtwebengine index f8898170..8161f340 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f8898170a77593e314d3cd187f259223e9bff0f8 +Subproject commit 8161f340cc1517c90f8232284aa42f84d7f2aae9 From 3a0c2b894cadf23a113d950a863891a85b25af5f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 16 May 2018 23:33:33 +0200 Subject: [PATCH 10/27] Update submodules on '5.11' in qt5 Change-Id: I9d3f11e5fa9df3a4596474312a2ffc0426e495c5 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtqa | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 410b9435..fce6303a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 410b94351663a4ce12a2cad9c9a5d28fc6dfd5e4 +Subproject commit fce6303a35aba228f19ad540229322e8232425e1 diff --git a/qtdeclarative b/qtdeclarative index 710f9507..7d1af108 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 710f9507c0ebf01d9e9f717e676b9c3b1b94ee8a +Subproject commit 7d1af10821e7356fb7e33f412e028da99e0e306c diff --git a/qtlocation b/qtlocation index d4702774..c91bfe1d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d4702774718a64e6190a786bab03fcbedddbc14d +Subproject commit c91bfe1d1d4fcb29a1f44d32235f82e4ec4a3ccd diff --git a/qtqa b/qtqa index 46daf8aa..79f009af 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 46daf8aac235107d0c77fe3a887ecb73f85b4159 +Subproject commit 79f009afd8ee0ad1c032f2235e09971ac1b5c376 diff --git a/qtwebengine b/qtwebengine index 8161f340..8476245d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8161f340cc1517c90f8232284aa42f84d7f2aae9 +Subproject commit 8476245d1a197d05f988ef87f17b7ccbbcbba878 From ea52430c6651a3ed9700e71ff8f53d759f1929a0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 17 May 2018 22:52:31 +0200 Subject: [PATCH 11/27] Update submodules on '5.11' in qt5 Change-Id: I888cec01eaeab2b2029b172061d2ce07170faa97 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdoc | 2 +- qtremoteobjects | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index fce6303a..c359df5c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fce6303a35aba228f19ad540229322e8232425e1 +Subproject commit c359df5ca6c70e254de2014d9a7c02c68017f772 diff --git a/qtdoc b/qtdoc index 1c26dd6c..56530a16 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 1c26dd6cb5e5cd016fa4bb4b14914993b1450565 +Subproject commit 56530a16a478bf7ba673c477b86f5408e3e7a5ba diff --git a/qtremoteobjects b/qtremoteobjects index 61e12ed7..28c958a0 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 61e12ed7e2ab140c04860d1278f3492afe3d27fe +Subproject commit 28c958a04cbb432cba7de11ca99c23436f9cd2d1 diff --git a/qtwebengine b/qtwebengine index 8476245d..cd1af11a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8476245d1a197d05f988ef87f17b7ccbbcbba878 +Subproject commit cd1af11a3a7fc41afa2f628b967344fd92f02a6f From b6c915e4c5f2595187afa3d2e895858ba8bb4a63 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 18 May 2018 11:59:00 +0200 Subject: [PATCH 12/27] Update submodules on '5.11' in qt5 Change-Id: I9398f42e940a4249e1fece564e51aa028e7f7464 Reviewed-by: Liang Qi --- qtdoc | 2 +- qtremoteobjects | 2 +- qtspeech | 2 +- qttools | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtdoc b/qtdoc index 56530a16..4c65ec01 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 56530a16a478bf7ba673c477b86f5408e3e7a5ba +Subproject commit 4c65ec0101824a0e77ed5e58960b82603088348a diff --git a/qtremoteobjects b/qtremoteobjects index 28c958a0..4b9ce6c6 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 28c958a04cbb432cba7de11ca99c23436f9cd2d1 +Subproject commit 4b9ce6c6039290b1f12ae34d7973109f4cf275f9 diff --git a/qtspeech b/qtspeech index d0494c3b..1d8cdb91 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit d0494c3b3842ef77be355e764c1ba17f369d3278 +Subproject commit 1d8cdb9107dcefb97b4ff344ca58cb49bda1484d diff --git a/qttools b/qttools index 7a3cda81..f767d707 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7a3cda81ac1103afbe0224006fedd2f7f10b1ab6 +Subproject commit f767d707397341ed9175a3c9d7f57175fb2a8d96 diff --git a/qtwebengine b/qtwebengine index cd1af11a..9233ac4b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit cd1af11a3a7fc41afa2f628b967344fd92f02a6f +Subproject commit 9233ac4b4cd22da400b0c94ca13b334c562582b9 From 9dbf3d46baa6565d0676a97e397231b253d08ba7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 19 May 2018 03:02:20 +0300 Subject: [PATCH 13/27] Update submodules on '5.11' in qt5 Change-Id: I24c92fc659cbf40271b171ecf8179ffed14e5454 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtcharts | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtremoteobjects | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index c359df5c..8d19afcc 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c359df5ca6c70e254de2014d9a7c02c68017f772 +Subproject commit 8d19afcc815c62c691293462d4ed0ff25e445cdf diff --git a/qtcharts b/qtcharts index 213a9c30..a164d5e2 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 213a9c307dfef2209d217cb539554535c78f5003 +Subproject commit a164d5e21aed970a9cd16dd13d233cdc53f01d2d diff --git a/qtdoc b/qtdoc index 4c65ec01..f867b628 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 4c65ec0101824a0e77ed5e58960b82603088348a +Subproject commit f867b628c751e60e2614867a9608f9ba50d0598f diff --git a/qtlocation b/qtlocation index c91bfe1d..28994ca7 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c91bfe1d1d4fcb29a1f44d32235f82e4ec4a3ccd +Subproject commit 28994ca77e513a95efd47742742ef6379570e5f9 diff --git a/qtremoteobjects b/qtremoteobjects index 4b9ce6c6..64769bd6 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 4b9ce6c6039290b1f12ae34d7973109f4cf275f9 +Subproject commit 64769bd679eb58c5ce01c16cfe66649deed12bc8 diff --git a/qtwebengine b/qtwebengine index 9233ac4b..08db7562 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9233ac4b4cd22da400b0c94ca13b334c562582b9 +Subproject commit 08db7562bf7709122807f151cab710b3fd9d7c19 From b496b5f4d2693890e5bea37f147527ef22c7f584 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 20 May 2018 03:00:52 +0300 Subject: [PATCH 14/27] Update submodules on '5.11' in qt5 Change-Id: I3883afd4c1f626825e7c5741364f255862a2e512 Reviewed-by: Qt Submodule Update Bot --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index 08db7562..af0c47b1 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 08db7562bf7709122807f151cab710b3fd9d7c19 +Subproject commit af0c47b1307e74d3ed575f57111eb33900417199 From 407d64d58449ab14a97a3601d68184b873b04b4f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 21 May 2018 03:01:16 +0300 Subject: [PATCH 15/27] Update submodules on '5.11' in qt5 Change-Id: I1b7a7a9970f15669e9957a99b1f932e0ad22a209 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 8d19afcc..c780434b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8d19afcc815c62c691293462d4ed0ff25e445cdf +Subproject commit c780434ba24ff28bc8a19c2a6145c02b703336a7 From 2a27a539e7a44ca613c844114251b56573d12ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 14 May 2018 10:00:35 +0300 Subject: [PATCH 16/27] Restore clang version 4.0 to RHEL 6.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Libclang is required for Pyside to compile, so dropping it totally would block Pyside development. Change-Id: I9c0deb3f0457f97bc4c36179971d49d58ca244a6 Reviewed-by: Tony Sarajärvi Reviewed-by: Akseli Salovaara --- .../qtci-linux-RHEL-6.6-x86_64/08-libclang.sh | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh new file mode 100755 index 00000000..5f3715de --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite 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 + +BASEDIR=$(dirname "$0") +# With RHEL 6.6 we are using different lib clang than others +VERSION=4.0 +URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z" +SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952" + +"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION" From 0cd3312bd43dabefbb2fd019d7031f09cffffdce Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 22 May 2018 03:01:25 +0300 Subject: [PATCH 17/27] Update submodules on '5.11' in qt5 Change-Id: I75e33acd5abd94893ba89acc249ef3808b04b06f Reviewed-by: Qt Submodule Update Bot --- qtlocation | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtlocation b/qtlocation index 28994ca7..55bbdc5e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 28994ca77e513a95efd47742742ef6379570e5f9 +Subproject commit 55bbdc5ee5d7891676c1474ce51cbb6971efbdfb From 32c5bc52ce61df8eeb52634cd588a5a8d512a20c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 24 May 2018 03:01:41 +0300 Subject: [PATCH 18/27] Update submodules on '5.11' in qt5 Change-Id: I167745a5280f35ab02e81e4a55c87f779d3f1a1a Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtcanvas3d | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtscript | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qtbase b/qtbase index c780434b..b9bc6c31 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c780434ba24ff28bc8a19c2a6145c02b703336a7 +Subproject commit b9bc6c31a0987143cfedee7041d542b26a726966 diff --git a/qtcanvas3d b/qtcanvas3d index 73fba685..3eeb5456 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 73fba685d9f725fc0c9cf4f631371aa63a7b77a7 +Subproject commit 3eeb545694657a30a93c9aa8ce49d5015861c119 diff --git a/qtdeclarative b/qtdeclarative index 7d1af108..5b8a94eb 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7d1af10821e7356fb7e33f412e028da99e0e306c +Subproject commit 5b8a94eb8e5d4e3b79ab73a9a0325f838ecbe41a diff --git a/qtimageformats b/qtimageformats index 92398950..62082a63 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 92398950d9cfe5a88cb685ec166eb413aa8613ec +Subproject commit 62082a63e112e9991b33c2045896ced78ffcb62e diff --git a/qtlocation b/qtlocation index 55bbdc5e..8a7c9fa1 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 55bbdc5ee5d7891676c1474ce51cbb6971efbdfb +Subproject commit 8a7c9fa1a705f7a2fb3f066b755faaa2f4064ceb diff --git a/qtquickcontrols b/qtquickcontrols index 0c40c9da..4c6f7c93 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 0c40c9dae7c944bbf48c00c32a046a879fa0e7ac +Subproject commit 4c6f7c9321e1b080ea0ac883a9306ee569b9ec7b diff --git a/qtscript b/qtscript index 3813b620..9d1a9073 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 3813b6205b3519fc3372d0e6a8073d2fb82a6145 +Subproject commit 9d1a907345d6a04178b93389803e2d17f090953a diff --git a/qttools b/qttools index f767d707..051bc19f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f767d707397341ed9175a3c9d7f57175fb2a8d96 +Subproject commit 051bc19f7d71a65fd31dde12f71a68ee1393f89c diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index ebb6c180..04a5e9e7 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit ebb6c180bef3156cfe2d2df134e5d1bdf0f771b8 +Subproject commit 04a5e9e77554bc6d7cd43951077514a87bde2e0d diff --git a/qtwayland b/qtwayland index 03e1c35a..40068e5b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 03e1c35ab6a4395db3c7b71dd0bdd9a1956f7272 +Subproject commit 40068e5bb5511f5ccbc28e1edd1ee26b91d0c1ec diff --git a/qtwebchannel b/qtwebchannel index dff78566..d34f509f 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit dff78566654e47b22fd93d6c288c29fed4a742fe +Subproject commit d34f509f6985fc70163c106ca68b8be82eaecc9b diff --git a/qtwebengine b/qtwebengine index af0c47b1..3fd1031c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit af0c47b1307e74d3ed575f57111eb33900417199 +Subproject commit 3fd1031c425204b8d92c69528277bfbd7912e8e7 diff --git a/qtwebglplugin b/qtwebglplugin index d89846b8..11085947 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit d89846b8ad6cc0b662820ba8666fddd9a08be4ff +Subproject commit 110859475c80df0db73afff01360152f35b962e4 From 275f53c68187f5ba1f160a450f2ed51813d42f0d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 25 May 2018 03:01:26 +0300 Subject: [PATCH 19/27] Update submodules on '5.11' in qt5 Change-Id: Ide77625c853aa01db8e4d6e51bc7d693788884c2 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 9c889c7b..6eb91fc0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9c889c7be3b45a1fe21dbd8d134efc4402ff6d16 +Subproject commit 6eb91fc0b8f44931b8e2178c770f1eba9425aeec diff --git a/qtbase b/qtbase index b9bc6c31..747de3e0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b9bc6c31a0987143cfedee7041d542b26a726966 +Subproject commit 747de3e067c80de0063fdbaa3054ba9003b9e5a4 diff --git a/qtdeclarative b/qtdeclarative index 5b8a94eb..0e07410b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5b8a94eb8e5d4e3b79ab73a9a0325f838ecbe41a +Subproject commit 0e07410b829e7f879f436ca8a168d05016acf84a diff --git a/qtqa b/qtqa index 79f009af..82a3dfd8 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 79f009afd8ee0ad1c032f2235e09971ac1b5c376 +Subproject commit 82a3dfd8a6cda7d30389af92163e82e1d34fae73 diff --git a/qtquickcontrols b/qtquickcontrols index 4c6f7c93..4aec7d14 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4c6f7c9321e1b080ea0ac883a9306ee569b9ec7b +Subproject commit 4aec7d14d57b10f7fc503644d3cad44d9f166322 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d926bce8..3599f58d 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d926bce841797a88b972ada10f27126a1fa65738 +Subproject commit 3599f58db538bab4d8d8eeeb655e04b3b42b4ada diff --git a/qttools b/qttools index 051bc19f..8c018aec 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 051bc19f7d71a65fd31dde12f71a68ee1393f89c +Subproject commit 8c018aec6b6563784229452fe29a27764b070e34 diff --git a/qtwebengine b/qtwebengine index 3fd1031c..da78ee6b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3fd1031c425204b8d92c69528277bfbd7912e8e7 +Subproject commit da78ee6b6b0b523c1d08641440e3907de69330c5 From 45709cec07594c950c64295e07be8dc42da963c0 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Tue, 22 May 2018 09:06:11 +0200 Subject: [PATCH 20/27] Provisioning: Update Open62541 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I04d8dfed982c68efb83f28a2f34f8632e3a66312 Reviewed-by: Jannis Völker Reviewed-by: Frank Meerkoetter --- coin/provisioning/common/linux/open62541.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/linux/open62541.sh b/coin/provisioning/common/linux/open62541.sh index 433748d1..97a76886 100755 --- a/coin/provisioning/common/linux/open62541.sh +++ b/coin/provisioning/common/linux/open62541.sh @@ -59,7 +59,7 @@ sudo pip install six git clone https://github.com/open62541/open62541.git open62541 cd open62541 -git checkout ba3b55ab4afafe6bc9d2cb922eafd51c6cee4629 +git checkout 8845e493d7751fd4eee3917b540e5346646b9cf7 mkdir build cd build cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -DLIB_INSTALL_DIR:PATH=/usr/local/lib/open62541 .. From b317ad80963fbba4e7723ab1f47a95efbcb88da2 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Wed, 23 May 2018 13:46:41 +0200 Subject: [PATCH 21/27] Remove hardcoded download path Previously all files got downloaded to a hardcoded path, including the username for the CI machines. Usually, it does not fit the username of a local development machine, complicating to reproduce bugs. Introduce Get-(Default)DownloadLocation functions in helpers to specify the default download location. This helps to run the provisioning scripts on a local machine. Change-Id: I761a92bf5e3e774358756a95dddb9a5d6ee54db9 Reviewed-by: Oliver Wolff --- .../provisioning/common/windows/3dstudio_3rdparty.ps1 | 3 ++- coin/provisioning/common/windows/android-openssl.ps1 | 2 +- coin/provisioning/common/windows/cmake.ps1 | 2 +- coin/provisioning/common/windows/helpers.ps1 | 11 +++++++++++ coin/provisioning/common/windows/jom.ps1 | 2 +- coin/provisioning/common/windows/libclang.ps1 | 2 +- coin/provisioning/common/windows/libusb.ps1 | 2 +- coin/provisioning/common/windows/mqtt_broker.ps1 | 2 +- coin/provisioning/common/windows/ninja.ps1 | 2 +- coin/provisioning/common/windows/winrtrunner.ps1 | 2 +- .../qtci-windows-10-x86_64/05-qnx_700.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/04-msys.ps1 | 2 +- 12 files changed, 23 insertions(+), 11 deletions(-) diff --git a/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 b/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 index ed408b6c..049fdc1b 100644 --- a/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 +++ b/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 @@ -1,6 +1,7 @@ . "$PSScriptRoot\helpers.ps1" -$zip = "c:\users\qt\downloads\Qt3DStudio-3rdparty-win64-CI.zip" +$zip = Get-DownloadLocation "Qt3DStudio-3rdparty-win64-CI.zip" + $url = "http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip" Download $url $url $zip diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 53c2ee17..d838fcc8 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -40,7 +40,7 @@ # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html $version = "1.0.2o" -$zip = "c:\users\qt\downloads\openssl-$version.tar.gz" +$zip = Get-DownloadLocation ("openssl-$version.tar.gz") $sha1 = "a47faaca57b47a0d9d5fb085545857cc92062691" $destination = "C:\Utils\openssl-android-master" diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index ace68835..ec84d706 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -36,7 +36,7 @@ $majorminorversion = "3.6" $version = "3.6.2" -$zip = "c:\users\qt\downloads\cmake-" + $version + "-win32-x86.zip" +$zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" $cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip" diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index 8a4b452e..28ccaeaf 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -68,6 +68,17 @@ function BadParam throw("You must specify $Description") } +function Get-DefaultDownloadLocation +{ + return $env:USERPROFILE + "\downloads\" +} + +function Get-DownloadLocation +{ + Param ([string]$TargetName = $(BadParam("a target filename"))) + return (Get-DefaultDownloadLocation) + $TargetName +} + function Download { Param ( diff --git a/coin/provisioning/common/windows/jom.ps1 b/coin/provisioning/common/windows/jom.ps1 index 68db6b17..7c59c61c 100644 --- a/coin/provisioning/common/windows/jom.ps1 +++ b/coin/provisioning/common/windows/jom.ps1 @@ -1,6 +1,6 @@ . "$PSScriptRoot\helpers.ps1" -$zip = "c:\users\qt\downloads\jom_1_1_2.zip" +$zip = Get-DownloadLocation "jom_1_1_2.zip" Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_2.zip -OutFile $zip Verify-Checksum $zip "80EE5678E714DE99DDAF5F7593AB04DB1C7928E4" diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index db277134..b0705105 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -16,7 +16,7 @@ Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object { $libclang_version = $libclang_version -replace '["."]' } -$zip = "c:\users\qt\downloads\libclang.7z" +$zip = Get-DownloadLocation "libclang.7z" $baseDestination = "C:\Utils\libclang-" + $libclang_version + "-" + $toolchain function setURL() { diff --git a/coin/provisioning/common/windows/libusb.ps1 b/coin/provisioning/common/windows/libusb.ps1 index 3207131b..68375263 100644 --- a/coin/provisioning/common/windows/libusb.ps1 +++ b/coin/provisioning/common/windows/libusb.ps1 @@ -35,7 +35,7 @@ . "$PSScriptRoot\helpers.ps1" -$archive = "C:\users\qt\downloads\libusb-1.0.21-ife3db79196-msvc2015.7z" +$archive = Get-DownloadLocation "libusb-1.0.21-ife3db79196-msvc2015.7z" $libusb_location = "C:\Utils\libusb-1.0" Copy-Item \\ci-files01-hki.intra.qt.io\provisioning\libusb-1.0\libusb-1.0.21-ife3db79196-msvc2015.7z $archive diff --git a/coin/provisioning/common/windows/mqtt_broker.ps1 b/coin/provisioning/common/windows/mqtt_broker.ps1 index 205d9c95..a80e23dd 100644 --- a/coin/provisioning/common/windows/mqtt_broker.ps1 +++ b/coin/provisioning/common/windows/mqtt_broker.ps1 @@ -34,7 +34,7 @@ . "$PSScriptRoot\helpers.ps1" Write-Host "MQTT: Downloading Paho test broker..." -$zip = "c:\users\qt\downloads\pahotest.zip" +$zip = Get-DownloadLocation "pahotest.zip" $externalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip" $internalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip" $sha1 = "532fe145096cdd8d679f425cbfd883289150c968" diff --git a/coin/provisioning/common/windows/ninja.ps1 b/coin/provisioning/common/windows/ninja.ps1 index 5b6729f5..95932c61 100644 --- a/coin/provisioning/common/windows/ninja.ps1 +++ b/coin/provisioning/common/windows/ninja.ps1 @@ -1,6 +1,6 @@ . "$PSScriptRoot\helpers.ps1" -$zip = "c:\users\qt\downloads\ninja-1.6.0-win-x86.zip" +$zip = Get-DownloadLocation "ninja-1.6.0-win-x86.zip" Download https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.6.0-win-x86.zip $zip Verify-Checksum $zip "E01093F6533818425F8EFB0843CED7DCAABEA3B2" diff --git a/coin/provisioning/common/windows/winrtrunner.ps1 b/coin/provisioning/common/windows/winrtrunner.ps1 index 9cdd04ab..53955201 100644 --- a/coin/provisioning/common/windows/winrtrunner.ps1 +++ b/coin/provisioning/common/windows/winrtrunner.ps1 @@ -1,6 +1,6 @@ . "$PSScriptRoot\helpers.ps1" -$zip = "c:\users\qt\downloads\winrtrunner.zip" +$zip = Get-DownloadLocation "winrtrunner.zip" $url = "http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner.zip" Download $url $url $zip diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index 991ccfa6..821c513e 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -35,7 +35,7 @@ # This script installs QNX SDP 7.0 -$zip = "c:\users\qt\downloads\qnx700.7z" +$zip = Get-DownloadLocation "qnx700.7z" $url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z" Download $url $url $zip diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 index be52fb2a..24d7a5ca 100644 --- a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 @@ -5,7 +5,7 @@ $version = "1.0.11" $url = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msys-$version.7z" -$zip = "c:\users\qt\downloads\msys-$version.7z" +$zip = Get-DownloadLocation ("msys-$version.7z") $sha1 = "22cd76f1263db8c72727a9537228c481ff33c285" $destination = "C:\msys" From 6f6efe15fd4cb18aa3883ad60f3b4905eff53ee8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 26 May 2018 03:02:19 +0300 Subject: [PATCH 22/27] Update submodules on '5.11' in qt5 Change-Id: I09f4b1a1c4d50f935f5d7c83fcab232d05630b68 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 747de3e0..8050f1c2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 747de3e067c80de0063fdbaa3054ba9003b9e5a4 +Subproject commit 8050f1c287490ec6130e85e83beb55dccab0294d diff --git a/qtdeclarative b/qtdeclarative index 0e07410b..9a44e3b6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0e07410b829e7f879f436ca8a168d05016acf84a +Subproject commit 9a44e3b6ca81f0e84d774a95e45b449b5d4cb583 diff --git a/qtwayland b/qtwayland index 40068e5b..1eba531d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 40068e5bb5511f5ccbc28e1edd1ee26b91d0c1ec +Subproject commit 1eba531d5b62bc171839d71e4a745ab9cdaaf907 diff --git a/qtwebengine b/qtwebengine index da78ee6b..29572399 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit da78ee6b6b0b523c1d08641440e3907de69330c5 +Subproject commit 2957239985e6e343bf2e3f3b9a08c6c5ff379bda diff --git a/qtwebglplugin b/qtwebglplugin index 11085947..2aaf05b3 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 110859475c80df0db73afff01360152f35b962e4 +Subproject commit 2aaf05b352019f863c6308d8c749ece5ecbba96b From 15ae235e51a3542f4594436877f3c13946daf6b7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 27 May 2018 03:01:20 +0300 Subject: [PATCH 23/27] Update submodules on '5.11' in qt5 Change-Id: Ic5b0846668d59b88e47e432dd692b569079e09a3 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 8050f1c2..e15fc26e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8050f1c287490ec6130e85e83beb55dccab0294d +Subproject commit e15fc26e9fdbff141890a3e2e8dc4ef935d022a0 From e57ef7c949a15c6699f96b55511842c4d10921f5 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Thu, 24 May 2018 13:51:19 +0200 Subject: [PATCH 24/27] Update winrtrunner A newer build of winrtrunner is needed. It is built from dev and contains fixes related to handling of test output (most importantly 044e9ad878ed1cf0ace0a9260b55cc94c71a294d). To make the script more stable, the newer version of winrtrunner was also copied to ci-files01, so that an alternative download location can be offered. Change-Id: I6a429aa3292266067756ce7ba3553088dc168197 Reviewed-by: Maurice Kalinowski --- coin/provisioning/common/windows/winrtrunner.ps1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/windows/winrtrunner.ps1 b/coin/provisioning/common/windows/winrtrunner.ps1 index 53955201..cab71f50 100644 --- a/coin/provisioning/common/windows/winrtrunner.ps1 +++ b/coin/provisioning/common/windows/winrtrunner.ps1 @@ -1,10 +1,11 @@ . "$PSScriptRoot\helpers.ps1" $zip = Get-DownloadLocation "winrtrunner.zip" -$url = "http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner.zip" +$url = "http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner_2018-05-24.zip" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\winrtrunner\winrtrunner_2018-05-24.zip" -Download $url $url $zip -Verify-Checksum $zip "C19098A4C9DBD20EDEB4E5E0D3E6A5BBBCA73C42" +Download $url $url_cache $zip +Verify-Checksum $zip "b83f2166b5799910a661d1db02771edf94880785" Extract-7Zip $zip C:\Utils\winrtrunner Remove-Item -Path $zip From e9faaf82395aab6c4746056082b4da057f4d08dd Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Fri, 25 May 2018 10:09:55 +0300 Subject: [PATCH 25/27] Provisioning: Remove broken proxy setup from RTA 32-bit Windows 10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently the proxy disabling script on 32-bit Windows breaks the internet settings, preventing browser usage for example. Change-Id: I77282f0d929a6223ceafd3b648d2e2a7b16186c9 Reviewed-by: Johanna Äijälä Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-windows-10-x86/01-set-proxy.ps1 | 1 - coin/provisioning/qtci-windows-10-x86/99-unset-proxy.ps1 | 1 - 2 files changed, 2 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86/01-set-proxy.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/99-unset-proxy.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/01-set-proxy.ps1 b/coin/provisioning/qtci-windows-10-x86/01-set-proxy.ps1 deleted file mode 100644 index 13b1ec60..00000000 --- a/coin/provisioning/qtci-windows-10-x86/01-set-proxy.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\set-proxy.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/99-unset-proxy.ps1 b/coin/provisioning/qtci-windows-10-x86/99-unset-proxy.ps1 deleted file mode 100644 index 0c25a0fb..00000000 --- a/coin/provisioning/qtci-windows-10-x86/99-unset-proxy.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\unset-proxy.ps1" From 7c3689778e3f125971ff2ef32ce2489270fd96e1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 29 May 2018 03:01:55 +0300 Subject: [PATCH 26/27] Update submodules on '5.11' in qt5 Change-Id: Ib8dd64712bea33b7dffc46ea13bdd7c5239121cb Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 6eb91fc0..f4c090a7 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6eb91fc0b8f44931b8e2178c770f1eba9425aeec +Subproject commit f4c090a71baab62038f241a55edb4b578cdd749a diff --git a/qtbase b/qtbase index e15fc26e..42e4a653 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e15fc26e9fdbff141890a3e2e8dc4ef935d022a0 +Subproject commit 42e4a6531d89601499e5d3d419216a4bbacf6670 diff --git a/qtdeclarative b/qtdeclarative index 9a44e3b6..854c15cd 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9a44e3b6ca81f0e84d774a95e45b449b5d4cb583 +Subproject commit 854c15cdb64f9693fc8d90f73464d499ebdca4fd diff --git a/qtgraphicaleffects b/qtgraphicaleffects index ae969362..a5e792fd 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit ae9693620ebb61c7f7384623527b1e2780068b95 +Subproject commit a5e792fd3fe214e7ffc368b66305467abfc74f9e diff --git a/qttools b/qttools index 8c018aec..548a7504 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 8c018aec6b6563784229452fe29a27764b070e34 +Subproject commit 548a75049efaa3f9b3087016e3e36cc9b4f23e2e diff --git a/qtwayland b/qtwayland index 1eba531d..2b67dd2f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 1eba531d5b62bc171839d71e4a745ab9cdaaf907 +Subproject commit 2b67dd2fc61331335cb3d80d15c07692bc1631b3 diff --git a/qtwebengine b/qtwebengine index 29572399..ea28cff7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2957239985e6e343bf2e3f3b9a08c6c5ff379bda +Subproject commit ea28cff7524bf0409b43c8ba3ede8fe2f7022ae4 From e09cd7630f3932063363a6d53de71ff22473de02 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 30 May 2018 03:06:43 +0300 Subject: [PATCH 27/27] Update submodules on '5.11' in qt5 Change-Id: I695ecee66a9a0c256e6df2c68790cf3f9d58ac9a Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtwayland | 2 +- qtwebglplugin | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index f4c090a7..6d21a804 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit f4c090a71baab62038f241a55edb4b578cdd749a +Subproject commit 6d21a80408bb5a258c5bb6e092a5ad451999789a diff --git a/qtbase b/qtbase index 42e4a653..9f27bfb3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 42e4a6531d89601499e5d3d419216a4bbacf6670 +Subproject commit 9f27bfb31acfba49a74a342d9249f24633a7ade2 diff --git a/qtconnectivity b/qtconnectivity index 88207ae8..aad6e265 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 88207ae868002f0b53151d2c5c2ac416284ce9c1 +Subproject commit aad6e26574ff069e080bf6461c0fb7d0fee9e403 diff --git a/qtdeclarative b/qtdeclarative index 854c15cd..2f4b8f15 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 854c15cdb64f9693fc8d90f73464d499ebdca4fd +Subproject commit 2f4b8f159545b545d4b49cb3c1429c09522519ee diff --git a/qtdoc b/qtdoc index f867b628..26e904f8 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f867b628c751e60e2614867a9608f9ba50d0598f +Subproject commit 26e904f883f881f64150bf131319baecaee37838 diff --git a/qtlocation b/qtlocation index 8a7c9fa1..b273e586 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8a7c9fa1a705f7a2fb3f066b755faaa2f4064ceb +Subproject commit b273e586b045c5114e52bc51d80dde9a7276d9ae diff --git a/qtquickcontrols b/qtquickcontrols index 4aec7d14..7eb6f79f 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4aec7d14d57b10f7fc503644d3cad44d9f166322 +Subproject commit 7eb6f79f5d98be6a0c6aa437b10d927c923ce056 diff --git a/qtwayland b/qtwayland index 2b67dd2f..01c566aa 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2b67dd2fc61331335cb3d80d15c07692bc1631b3 +Subproject commit 01c566aa88eb6debd96390e1968fb18d92367a37 diff --git a/qtwebglplugin b/qtwebglplugin index 2aaf05b3..bb866433 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 2aaf05b352019f863c6308d8c749ece5ecbba96b +Subproject commit bb8664336d216e35dd4c066f969de8151b7c3d18