From 8552003532ecc7d0c603c1c027378576795181b0 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 22 Mar 2018 09:17:46 +0100 Subject: [PATCH 01/19] Reduce wget verbosity when downloading qnx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The default style gives 1 KiB dots, 50 KiB per line, and the file is 567 MiB (~11600 lines). Reduce it to 1 MiB per dot and 32 MiB per line (~18 lines). Change-Id: Id181eee63313a4ad486af6c4752de0ed9ed5f7b6 Reviewed-by: Tony Sarajärvi Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/linux/qnx_700.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 584c91a8..b53c1d26 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -44,7 +44,7 @@ sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.tar.xz" sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113" folderName="qnx700" targetFile="qnx700.tar.xz" -wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile" +wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile" echo "$sha1 $targetFile" | sha1sum --check if [ ! -d "$targetFolder" ]; then mkdir -p $targetFolder From a01e7f3d405484791a1e37d35f12a5e894f51007 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 15 Mar 2018 13:22:00 +0100 Subject: [PATCH 02/19] Install an android virtual device for testing The goal is to run tests on the AVD eventually. Change-Id: I7ac887661497b5169c154ef8b0264ef07749a36a Reviewed-by: Eskil Abrahamsen Blomfeldt --- coin/provisioning/common/linux/android_linux.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 696f7d29..5679c4c6 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -95,3 +95,9 @@ echo "Android SDK tools = $toolsVersion" >> ~/versions.txt echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt echo "Android NDK = $ndkVersion" >> ~/versions.txt + +cd $sdkTargetFolder/tools/bin +echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86" +echo "no" | ./avdmanager create avd -n x86emulator -k "system-images;android-21;google_apis;x86" -c 2048M -f +# Purely informative, show the list of avd devices +./avdmanager list avd From 9dd5f6d861a920df1d92b85593c81172ca7e0feb Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 8 Mar 2018 12:06:08 +0200 Subject: [PATCH 03/19] Add SeparateDebugInfo for linux release Task-number: QTQAINFRA-1688 Change-Id: I3557ac1e2bb6964278f381736f87e6fd3304744b Reviewed-by: Aapo Keskimolo Reviewed-by: Jani Heikkinen --- coin/platform_configs/default.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 9ec6a406..a5dc5d4a 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -12,7 +12,7 @@ qtci-linux-Ubuntu-16.04-x86_64-2 GCC qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo -qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch qtci-osx-10.11-x86_64-3 Clang Release NoFramework DisableTests From 8f73d374257553eddae6ae74bff760cc9891dbed Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 28 Mar 2018 10:04:49 +0300 Subject: [PATCH 04/19] Update submodules on '5.11' in qt5 Change-Id: I77701db7d1955d7309d464ca1597888d98883a30 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/qt3d b/qt3d index 96d7e817..c99555e4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 96d7e81706114084e850f0215351d85be0486b5c +Subproject commit c99555e476fd7be943d476c5ce4463463628e412 diff --git a/qtbase b/qtbase index a65e383c..e83f1900 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a65e383cac24b043b1dbe7172e0b142454e93e52 +Subproject commit e83f1900f657a41036bd16e917527fcb7a52fd2b diff --git a/qtcanvas3d b/qtcanvas3d index 80d7f92b..ff771b7d 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 80d7f92b9628076b681e509ddf8eae43cac550d5 +Subproject commit ff771b7d57eb3654f6321eb105129a594ec2841e diff --git a/qtcharts b/qtcharts index 27d2c703..f61c2691 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 27d2c7035b1812dc2bdf7f0e580a42c613199fd8 +Subproject commit f61c26916edf9944ed1dd465f031620a80e98597 diff --git a/qtconnectivity b/qtconnectivity index 24a07f0a..54666d4b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 24a07f0a94a0ac036866c18ef415f06dd1fb8bbe +Subproject commit 54666d4b42cc212ad1639a058e90ad1f17eed898 diff --git a/qtdeclarative b/qtdeclarative index 2b0e0bee..e696a6b7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2b0e0bee0c6153a8912778de5ff1cabd728d98d8 +Subproject commit e696a6b7bff04d1581cf59b4d96ecb5508f54169 diff --git a/qtdoc b/qtdoc index 78992b83..ba5445a9 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 78992b83012eb36644a1da4affdede8baac9d2b5 +Subproject commit ba5445a949facd89472f2a54fb88dc57b118786c diff --git a/qtlocation b/qtlocation index 1ced79ad..bda6fa9d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 1ced79ad7cc256eb82113e3419cb09926ceae9c3 +Subproject commit bda6fa9d1f67525e741b45362c58ac4f1a780624 diff --git a/qtmultimedia b/qtmultimedia index e0a069ed..c96b95e5 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit e0a069edc2d79b69fd187ffbe03a8388a612b3ff +Subproject commit c96b95e50e71dfae82de5b822e7ab758787acd47 diff --git a/qtnetworkauth b/qtnetworkauth index 88694209..88e0b0fc 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 886942094513d4b32c7ff7358ee5dd23e8e0d83a +Subproject commit 88e0b0fc7e828533fa387f7a367e94b81674e3b1 diff --git a/qtquickcontrols b/qtquickcontrols index 71005834..a41a3268 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 710058343297bba7cc44fa2369b7cec742f34cb2 +Subproject commit a41a3268c7b1f1d510c452e5430db0d5e5ee4055 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index ce5b33c3..4df12d1a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit ce5b33c350cb7aa4a649088d85e48be08b632b69 +Subproject commit 4df12d1ae59da65c1338b1e3b894e8f88beded0f diff --git a/qtscxml b/qtscxml index babefa4e..67d48807 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit babefa4ef71618e357521c8260b0714c5a0f1d2f +Subproject commit 67d48807b44735a2385b88db7ada01f7cd7eacfd diff --git a/qtsensors b/qtsensors index d8eef168..29f2041f 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit d8eef1687dbd7a39affaedc24f7faef320ef33bd +Subproject commit 29f2041f4da53815491affbf19ec008820c76e29 diff --git a/qtserialbus b/qtserialbus index 20cbe35d..7083fe4a 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 20cbe35dc3282b8e27278e3bd54d415cc8147d3c +Subproject commit 7083fe4a0a9c15c647c82d2614e373406258925e diff --git a/qttools b/qttools index 00ee178b..fbcf5ece 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 00ee178b2402720c915a76be40a2802024341bc6 +Subproject commit fbcf5ecedd86a0bbe98a8174288db278db0a25cb diff --git a/qtwayland b/qtwayland index 26a6372b..6218661c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 26a6372bb0c6528358e34f8175a14ff0be47fb12 +Subproject commit 6218661c89a5f9ee36785d187018b98855d7bab1 diff --git a/qtwebengine b/qtwebengine index 831d20bf..69c9f404 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 831d20bfb1bd677245c1fbdd5ded0fc757c44541 +Subproject commit 69c9f404b8411dc1808ba2799dacd7756d196e83 diff --git a/qtwebglplugin b/qtwebglplugin index a4e460a0..40dff672 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit a4e460a01f1962317093a5fb2170c869aead954a +Subproject commit 40dff6727a2f70b795df9a93f9d890dd1b8fb834 diff --git a/qtwebsockets b/qtwebsockets index 8a549aca..bcea7a1a 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 8a549aca7b371722cbf012d85216e4560ef1cf33 +Subproject commit bcea7a1a8b46aa1e9e5fcf3e43bd251360cf8634 diff --git a/qtwebview b/qtwebview index a499bd8b..574bb84a 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit a499bd8b96715912948fbfe1ae435dc325c9d170 +Subproject commit 574bb84a8b17b510b2ad8661a3bc5fa54e021310 From c8b3ed182ddbfb8a0e1d73f99a4582847def6cab Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 30 Mar 2018 03:01:04 +0300 Subject: [PATCH 05/19] Update submodules on '5.11' in qt5 Change-Id: I2f7afb1e261e59e527a482983f699402f0d29d85 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtpurchasing | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index e83f1900..72f8f994 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e83f1900f657a41036bd16e917527fcb7a52fd2b +Subproject commit 72f8f994b26fe51bf4828e17096b7ec0abe1f0d3 diff --git a/qtdatavis3d b/qtdatavis3d index 8a053119..6c253768 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 8a053119642986f8163b749c3c4f6a81a664509c +Subproject commit 6c253768e2fb6c0892215f3d93f36be7cece637e diff --git a/qtdeclarative b/qtdeclarative index e696a6b7..2d48082e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e696a6b7bff04d1581cf59b4d96ecb5508f54169 +Subproject commit 2d48082e322ae1600985491fe15528dd48a5c604 diff --git a/qtimageformats b/qtimageformats index f878323a..4e10f354 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit f878323a82fa69fcaeb37b42e10ba28759157f47 +Subproject commit 4e10f35483db6d3396fe54dcf3d895d7850f8335 diff --git a/qtlocation b/qtlocation index bda6fa9d..27837cdf 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit bda6fa9d1f67525e741b45362c58ac4f1a780624 +Subproject commit 27837cdf26a2f7d83f57f55a1a4e7ce947479592 diff --git a/qtpurchasing b/qtpurchasing index 51b83b74..02246cd6 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 51b83b74bb3d0ed406e28f89cbde1441782b82b2 +Subproject commit 02246cd68ca14345d95cbd8893fd24ff60faa73f diff --git a/qtremoteobjects b/qtremoteobjects index 199090d2..6e5e4df3 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 199090d2bac6b429e8c8ba114eea3bd3c4efc255 +Subproject commit 6e5e4df3c65e01bae143887fb4eff409c846023a diff --git a/qttools b/qttools index fbcf5ece..f1c59c4e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit fbcf5ecedd86a0bbe98a8174288db278db0a25cb +Subproject commit f1c59c4e73236f8a93489776f3746d72dde94cc4 diff --git a/qtwebengine b/qtwebengine index 69c9f404..74747087 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 69c9f404b8411dc1808ba2799dacd7756d196e83 +Subproject commit 747470873e66ad619378ed9a34a94a4c275d1312 From dbe27bc9ccb915638de06bb5a23be1a0cd4d6b9f Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Tue, 27 Mar 2018 15:23:46 +0300 Subject: [PATCH 06/19] Provisioning: Win8.1 - Add jom for RTA Jom is required by RTA. Task-number: QTQAINFRA-1895 Change-Id: Iec99a91d2a48c4c6ef49829e4f05baa90d1a96e0 Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-windows-8.1-x86/60-jom.ps1 | 1 + coin/provisioning/qtci-windows-8.1-x86_64/60-jom.ps1 | 1 + 2 files changed, 2 insertions(+) create mode 100644 coin/provisioning/qtci-windows-8.1-x86/60-jom.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/60-jom.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/60-jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86/60-jom.ps1 new file mode 100644 index 00000000..b246ce25 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/60-jom.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\jom.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/60-jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/60-jom.ps1 new file mode 100644 index 00000000..b246ce25 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/60-jom.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\jom.ps1" From fe06923553a77ab59738ba0fbaab6a6e8adeb076 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 31 Mar 2018 03:01:31 +0300 Subject: [PATCH 07/19] Update submodules on '5.11' in qt5 Change-Id: I89c95acfd2ee14574c0ca524d80837023dbc112f Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 72f8f994..dbdd5f0f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 72f8f994b26fe51bf4828e17096b7ec0abe1f0d3 +Subproject commit dbdd5f0ffbce52c8b789ed09f1aa3f1da6c02e23 From 9f50ae280fb00cd3ab5500098b24201ec6f7a5c5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 1 Apr 2018 03:02:00 +0300 Subject: [PATCH 08/19] Update submodules on '5.11' in qt5 Change-Id: I7f31b0b19c8380a7f5420917ad7dc423e3ca3658 Reviewed-by: Qt Submodule Update Bot --- qtdeclarative | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtdeclarative b/qtdeclarative index 2d48082e..9159a7c3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2d48082e322ae1600985491fe15528dd48a5c604 +Subproject commit 9159a7c3db4a0625a2cbe690df5d22f8db1616d1 From 7c19a3f83b1ad83114bdc0a70b01f0afd493a79c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 2 Apr 2018 03:00:55 +0300 Subject: [PATCH 09/19] Update submodules on '5.11' in qt5 Change-Id: I7e60d0eae7d23fbc2eebf1734c3fd9a713b6b732 Reviewed-by: Qt Submodule Update Bot --- qtvirtualkeyboard | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 7683c588..7c193dfb 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 7683c588600fb23f774cbdbb4aacb4dd44d073e8 +Subproject commit 7c193dfb8d7f85561411e25224e9028b7c5943e4 From bb9547048b36148aad520939dab4fc84b06af6d9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 3 Apr 2018 20:56:20 +0300 Subject: [PATCH 10/19] Update submodules on '5.11' in qt5 Change-Id: I2c8dfa7b7b27e6aa80381761d8b7883690133496 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index dbdd5f0f..c7dac646 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit dbdd5f0ffbce52c8b789ed09f1aa3f1da6c02e23 +Subproject commit c7dac6469c3bc804a70e1afcc0dc7865afc28e5a diff --git a/qtdeclarative b/qtdeclarative index 9159a7c3..d2ed475b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9159a7c3db4a0625a2cbe690df5d22f8db1616d1 +Subproject commit d2ed475b84d872181b872472c742297476c062c2 diff --git a/qtlocation b/qtlocation index 27837cdf..0ffb8959 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 27837cdf26a2f7d83f57f55a1a4e7ce947479592 +Subproject commit 0ffb89591a9e2463b36948cdd5e2948de72e14c4 diff --git a/qtserialbus b/qtserialbus index 7083fe4a..fb561e9a 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 7083fe4a0a9c15c647c82d2614e373406258925e +Subproject commit fb561e9aa52d24b0156dc2c3987216954ad52107 diff --git a/qttools b/qttools index f1c59c4e..dd7fe16c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f1c59c4e73236f8a93489776f3746d72dde94cc4 +Subproject commit dd7fe16cc396470bacc23212dbe09de03503359f diff --git a/qtwebengine b/qtwebengine index 74747087..cce649b6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 747470873e66ad619378ed9a34a94a4c275d1312 +Subproject commit cce649b65d31353754af9e34148c0e8d4068d3cf From 9e74a1e5b7cf5f487b77068565ba7c0671b4dcd0 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Fri, 23 Mar 2018 09:29:30 +0200 Subject: [PATCH 11/19] Add a clean installed Win10_x86 for RTA Task-number: QTQAINFRA-1842 Change-Id: I0334d74055690c7f850fd105fe008d11a8e57b8c Reviewed-by: Matti Paaso --- coin/platform_configs/tqtc-qt-rta.txt | 2 +- coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 | 1 + coin/provisioning/qtci-windows-10-x86/08-install-jdk.ps1 | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/08-install-jdk.ps1 diff --git a/coin/platform_configs/tqtc-qt-rta.txt b/coin/platform_configs/tqtc-qt-rta.txt index 8143688f..5f9ab41f 100644 --- a/coin/platform_configs/tqtc-qt-rta.txt +++ b/coin/platform_configs/tqtc-qt-rta.txt @@ -2,5 +2,5 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-7-x86_64-4 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-8.1-x86_64 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86-6 MSVC2017 Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86-2 MSVC2017 Release ForceDebugInfo OpenGLDynamic diff --git a/coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 new file mode 100644 index 00000000..a9044256 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-10-x86/08-install-jdk.ps1 new file mode 100644 index 00000000..15065b55 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/08-install-jdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-jdk.ps1" From 3c23dc484635e4c3340461316454be50fe11e28f Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 5 Apr 2018 12:26:53 +0200 Subject: [PATCH 12/19] Don't require Qt Android Extras for Qt Purchasing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Qt Purchasing is supported on other platforms than Android, so move qtandroidextras from depends to recommends instead. Task-number: QTBUG-67318 Change-Id: I9c70574dd9b45579485b2640f7daeebdc6c2bc63 Reviewed-by: Jędrzej Nowacki Reviewed-by: Oswald Buddenhagen --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index ce89d72b..565896cc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -249,8 +249,8 @@ branch = 5.11 status = addon [submodule "qtpurchasing"] - depends = qtbase qtandroidextras - recommends = qtdeclarative + depends = qtbase + recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git branch = 5.11 From d4edeff8aac9a9c339fcc2927536ba6a508d8416 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 5 Apr 2018 12:16:37 +0200 Subject: [PATCH 13/19] Update submodules on '5.11' in qt5 Change-Id: Ic5b5615653f2fed507c75ca96a05de0affb65863 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index c99555e4..2a260617 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c99555e476fd7be943d476c5ce4463463628e412 +Subproject commit 2a260617b96281375e2ee018af8c7547d99e4a6d diff --git a/qtbase b/qtbase index c7dac646..3e1ecdd7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c7dac6469c3bc804a70e1afcc0dc7865afc28e5a +Subproject commit 3e1ecdd74cfb85d1c73f96289fc2114708881c6b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 4df12d1a..393cb6f0 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 4df12d1ae59da65c1338b1e3b894e8f88beded0f +Subproject commit 393cb6f0bacecfe2997c11307a102a9f0f17c173 diff --git a/qtremoteobjects b/qtremoteobjects index 6e5e4df3..35dd0809 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 6e5e4df3c65e01bae143887fb4eff409c846023a +Subproject commit 35dd08098f8a4b422d523792261aefe039358f6a diff --git a/qttools b/qttools index dd7fe16c..944b0f8b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit dd7fe16cc396470bacc23212dbe09de03503359f +Subproject commit 944b0f8b7b4426471fb475bc9b98152d005b197b diff --git a/qtwebengine b/qtwebengine index cce649b6..dd2acb8a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit cce649b65d31353754af9e34148c0e8d4068d3cf +Subproject commit dd2acb8a0a5ccbbf34664987fdcf4b3a418c54f9 From 9af755a79eba4a3b57c8e4b75df64070aec27458 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Fri, 6 Apr 2018 10:46:52 +0300 Subject: [PATCH 14/19] Add VC build tools to Windows 10 x86 template These tools were missing from the installation. Change-Id: I627b28a6f9373df708952e22a7f404b8dbce6239 Reviewed-by: Heikki Halmet --- coin/platform_configs/tqtc-qt-rta.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/tqtc-qt-rta.txt b/coin/platform_configs/tqtc-qt-rta.txt index 5f9ab41f..8fbb5a00 100644 --- a/coin/platform_configs/tqtc-qt-rta.txt +++ b/coin/platform_configs/tqtc-qt-rta.txt @@ -2,5 +2,5 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-7-x86_64-4 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-8.1-x86_64 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86-2 MSVC2017 Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic From 9fdc8fe5e9224ba6f81366a4cbd13f1c21750d7c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 6 Apr 2018 14:45:41 +0200 Subject: [PATCH 15/19] Update submodules on '5.11' in qt5 Change-Id: Ic767892fd0ed815d1cec35eced62e83b1ac4e029 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtnetworkauth | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index 2a260617..af4972fd 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 2a260617b96281375e2ee018af8c7547d99e4a6d +Subproject commit af4972fd15e6b11a99c631ff91b3360ceb8be5cc diff --git a/qtactiveqt b/qtactiveqt index c2fed236..51438b29 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit c2fed2369b31a6775aa52473b86ca9e3e07ab707 +Subproject commit 51438b29b93e1f9a6233b16ffddc82510072250a diff --git a/qtbase b/qtbase index 3e1ecdd7..fd87c8da 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3e1ecdd74cfb85d1c73f96289fc2114708881c6b +Subproject commit fd87c8da82b4bf52d395a5f9a2687e4eb7a22221 diff --git a/qtdeclarative b/qtdeclarative index d2ed475b..b780aeb0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d2ed475b84d872181b872472c742297476c062c2 +Subproject commit b780aeb0ce30b040b9057f1e2b447b08b24b45cb diff --git a/qtnetworkauth b/qtnetworkauth index 88e0b0fc..0d845e00 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 88e0b0fc7e828533fa387f7a367e94b81674e3b1 +Subproject commit 0d845e00a000f376101165ec9a5c9096030db25c diff --git a/qtquickcontrols b/qtquickcontrols index a41a3268..654de824 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit a41a3268c7b1f1d510c452e5430db0d5e5ee4055 +Subproject commit 654de8242411dae548795f9b17648608f8a8c28d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 393cb6f0..4a8c2605 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 393cb6f0bacecfe2997c11307a102a9f0f17c173 +Subproject commit 4a8c2605c26acf575e181682f083e077b815ab4b diff --git a/qtremoteobjects b/qtremoteobjects index 35dd0809..67ac9631 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 35dd08098f8a4b422d523792261aefe039358f6a +Subproject commit 67ac9631dbb26394e6b9981494a0aaf6124284a9 diff --git a/qttools b/qttools index 944b0f8b..c96755ea 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 944b0f8b7b4426471fb475bc9b98152d005b197b +Subproject commit c96755ea7eede1f1881e00718fc03c3f5f693c33 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 7c193dfb..a94870b1 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 7c193dfb8d7f85561411e25224e9028b7c5943e4 +Subproject commit a94870b1583857ee5a485ce68369373efb3a9fdc diff --git a/qtwebengine b/qtwebengine index dd2acb8a..fbfc9ee7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit dd2acb8a0a5ccbbf34664987fdcf4b3a418c54f9 +Subproject commit fbfc9ee7f06c6f36b79145bc7e8ba05c5d3fa621 diff --git a/qtwebglplugin b/qtwebglplugin index 40dff672..7bbbe5a8 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 40dff6727a2f70b795df9a93f9d890dd1b8fb834 +Subproject commit 7bbbe5a86779fd1ff55b07dbda433779f4aff6a7 diff --git a/qtwebsockets b/qtwebsockets index bcea7a1a..34ce4b65 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit bcea7a1a8b46aa1e9e5fcf3e43bd251360cf8634 +Subproject commit 34ce4b65ba35a487bdb8afa5e59b57cfa3f9b0e0 diff --git a/qtwebview b/qtwebview index 574bb84a..bb7dda99 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 574bb84a8b17b510b2ad8661a3bc5fa54e021310 +Subproject commit bb7dda99936b97cc262f07b25fcb500f8a552c8a From daeaec9b3cf8125256b01f16c77b67383ff6f301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 21 Mar 2018 15:48:40 +0200 Subject: [PATCH 16/19] Remove updating of RHEL 7.4 system during each provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Yum update doesn't only fetch the repository data. It also runs a distro upgrade. So if something gets updated that isn't compatible with us, it breaks. It also slows down the provisioning a lot. Change-Id: I27136bc572fbce5410b82ff9574cf85bf89e3100 Reviewed-by: Joni Jäntti Reviewed-by: Heikki Halmet --- .../qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index 56ed138a..bf706eb2 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -90,7 +90,6 @@ installPackages+=(libxslt-devel) # For building Wayland from source installPackages+=(libffi-devel) -sudo yum -y update sudo yum -y install "${installPackages[@]}" # Make python 2.7 and its pip default From 0029642f1835c3bcf0d18757d744564f84dacc3f Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Wed, 4 Apr 2018 08:39:36 +0200 Subject: [PATCH 17/19] Fix msvc_2015_update3_patch Change-Id: Ie008b274c2f27d9792340dd4f6c2d3215bd376ca Reviewed-by: Maurice Kalinowski --- coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 | 1 - 1 file changed, 1 deletion(-) diff --git a/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 b/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 index 3a351f41..a153e9d8 100644 --- a/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 +++ b/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 @@ -47,7 +47,6 @@ if (Test-Path $preparedPackage) { # The prepared package contains updated packages so that not everything has to be downloaded Write-Host "Using prepared package" Copy-Item -Recurse $preparedPackage $packagePath - exit 0 # Remove the whole downloaded folder $toRemove = $packagePath + "\vs14-kb3165756-update" $executable = "$toRemove\vs14-kb3165756.exe" From 7f6fd7621bf3c0f847f851df29ca3cb06112ffc4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 7 Apr 2018 03:01:25 +0300 Subject: [PATCH 18/19] Update submodules on '5.11' in qt5 Change-Id: Ie59c702af192cf03bb5c865345625f61feb83887 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qttranslations | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index fd87c8da..28c9ad19 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fd87c8da82b4bf52d395a5f9a2687e4eb7a22221 +Subproject commit 28c9ad199c313444149471e854bfa6cc7c708549 diff --git a/qtdeclarative b/qtdeclarative index b780aeb0..d868bb4f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b780aeb0ce30b040b9057f1e2b447b08b24b45cb +Subproject commit d868bb4f3e4b0424fd4a2989ff1c82692b0f014c diff --git a/qtlocation b/qtlocation index 0ffb8959..98878f5a 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0ffb89591a9e2463b36948cdd5e2948de72e14c4 +Subproject commit 98878f5a25578c66b001c27817bffac6e0f82d20 diff --git a/qttranslations b/qttranslations index d168acdd..446f2f8e 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit d168acdd2afc6ffb1fa3c1d6788b628affbcac59 +Subproject commit 446f2f8e444362b393efe57904e178a20346e88f diff --git a/qtwebengine b/qtwebengine index fbfc9ee7..3bc5b9d4 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit fbfc9ee7f06c6f36b79145bc7e8ba05c5d3fa621 +Subproject commit 3bc5b9d4f9d481707c02e83e0cd20f60dec425f2 From 1616d89eeaae1bb8d708f5ebd9eadc5c6f86660d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 10 Apr 2018 03:01:54 +0300 Subject: [PATCH 19/19] Update submodules on '5.11' in qt5 Change-Id: I71ed7dbae2d7071e9c16a6e24979174b1b75d640 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtserialport | 2 +- qttools | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index af4972fd..4f772615 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit af4972fd15e6b11a99c631ff91b3360ceb8be5cc +Subproject commit 4f7726155f586ae3aef0b111ae25eacaab91afe9 diff --git a/qtactiveqt b/qtactiveqt index 51438b29..c095e6ad 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 51438b29b93e1f9a6233b16ffddc82510072250a +Subproject commit c095e6ad6f5dbf7bb7082ab822aaa114f83ccc44 diff --git a/qtbase b/qtbase index 28c9ad19..3b85d539 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 28c9ad199c313444149471e854bfa6cc7c708549 +Subproject commit 3b85d53913741660473dbc242a48c2ee65d51421 diff --git a/qtconnectivity b/qtconnectivity index 54666d4b..96afc728 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 54666d4b42cc212ad1639a058e90ad1f17eed898 +Subproject commit 96afc728c508708da7a5fa16266dcafafcb60d0b diff --git a/qtdeclarative b/qtdeclarative index d868bb4f..51b73e0b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d868bb4f3e4b0424fd4a2989ff1c82692b0f014c +Subproject commit 51b73e0bb68812d78315af032546750d04656c02 diff --git a/qtlocation b/qtlocation index 98878f5a..886776c4 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 98878f5a25578c66b001c27817bffac6e0f82d20 +Subproject commit 886776c496d8902b56d47f7e5253d2e3a540b1f5 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 4a8c2605..cfe00c40 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 4a8c2605c26acf575e181682f083e077b815ab4b +Subproject commit cfe00c40127dbe5790e04cd9f810bcc98fee13ed diff --git a/qtserialport b/qtserialport index ea1a95d3..0c988e14 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit ea1a95d3567f1264126bf34218a5532ffb5afc51 +Subproject commit 0c988e14a90f3e1579365dc3dc99fbdd02ac3d4c diff --git a/qttools b/qttools index c96755ea..03923b27 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c96755ea7eede1f1881e00718fc03c3f5f693c33 +Subproject commit 03923b27ebf982629d2dd936b8597964cc464bfe diff --git a/qtwebengine b/qtwebengine index 3bc5b9d4..1478dd74 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3bc5b9d4f9d481707c02e83e0cd20f60dec425f2 +Subproject commit 1478dd7470c1215daf8cee2e2082d0c30ebb9aba