From bb5139dd0999c4679dc069cfe6cc0412c3a21598 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 27 Jan 2017 09:46:48 +0200 Subject: [PATCH 1/8] Enable autotests for Ubuntu 16.04 and swap configs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As autotests pass, we can also move all existing Ubuntu 14.04 configurations to run on a more recent Ubuntu 16.04. Task-number: QTQAINFRA-1101 Change-Id: I99c4f674dc48521c66ac579c6bb1b5396c282131 Reviewed-by: Qt CI Bot Reviewed-by: Simo Fält --- coin/platform_configs/default.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index bbee4866..71cfe22b 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -9,10 +9,8 @@ qtci-windows-10-x86-3 MSVC2015 qtci-windows-10-x86_64-3 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-3 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-3 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-Ubuntu-16.04-x86_64 GCC NoWidgets ForceDebugInfo DisableTests -qtci-linux-Ubuntu-16.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace DisableTests -qtci-linux-Ubuntu-14.04-x86_64 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-14.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace +qtci-linux-Ubuntu-16.04-x86_64 GCC NoWidgets ForceDebugInfo +qtci-linux-Ubuntu-16.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace qtci-linux-openSUSE-42.1-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-7.2-x86_64 GCC Packaging Release NoUseGoldLinker @@ -25,4 +23,4 @@ qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-16.04-x86_64 Boot2Qt_Jethro x86_64 GCC DisableTests qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-Ubuntu-14.04-x86_64 GCC TestOnly LicenseCheck +qtci-linux-Ubuntu-16.04-x86_64 GCC TestOnly LicenseCheck From d3534761122c7233cd58f78b5c45f2066dd8d803 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 10 Apr 2017 08:14:45 +0200 Subject: [PATCH 2/8] Update submodules on '5.9' in qt5 Change-Id: I9c5567a7b76101548b690dee3bba06fcdf11bd36 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwebengine | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index d9b4b28c..7cbbf942 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d9b4b28c5383a5d338a670e48aa1a4e4ba9fa3d9 +Subproject commit 7cbbf942972b9619af9442218ff2e16857536fb8 diff --git a/qtbase b/qtbase index 0624085b..43a5fe25 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0624085b73ff4d6537e3dd406f6b3701806626d0 +Subproject commit 43a5fe258b7f48baad69ac040f395cb597022fa9 diff --git a/qtconnectivity b/qtconnectivity index 3d8a4325..8f09b31d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 3d8a43250cf8293578b29b329c2a91d22e2fae79 +Subproject commit 8f09b31d98d50e9041d294e96eb0726cdf58f4b5 diff --git a/qtdatavis3d b/qtdatavis3d index b9bcebb3..73ec35fa 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit b9bcebb3808dc3fa2b6745cabdc272e1c933f7d5 +Subproject commit 73ec35fa12a4b150670ea93d3021ca8e658063e1 diff --git a/qtdeclarative b/qtdeclarative index 7c709ee4..452a78d0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7c709ee4404e737bebd576c4a1782593a6ec7da0 +Subproject commit 452a78d0ac4a1579733a8ab641be24c9b7c0dd96 diff --git a/qtlocation b/qtlocation index f4cd21d2..8714cb31 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f4cd21d2fd642fbb161860f6b729621d4e159ae3 +Subproject commit 8714cb31102026f96a3fbf10b8d715319d400536 diff --git a/qtmultimedia b/qtmultimedia index ba120a9b..6de2c8ac 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit ba120a9ba02232d713f8495403158ef06a8e67d4 +Subproject commit 6de2c8aca6736550d87057b0a3f025464bf21246 diff --git a/qtqa b/qtqa index cdd49851..b8198f71 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit cdd49851abf4aed4f960c4d7cef6c3bd08d5a961 +Subproject commit b8198f71d579f488d18e0bb7ef72c10f6a861ef6 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index f8224c9c..dcb0dd86 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit f8224c9c9e3dfc1fd4cc3bff915e7e2d1c411d05 +Subproject commit dcb0dd861bec6eb61b6bca6dad9399f59a5a1c2c diff --git a/qtserialbus b/qtserialbus index 86ae5181..e6a10bc0 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 86ae5181f462c923f2ef792db8f67f8228da0b25 +Subproject commit e6a10bc0b5c7be73c5a58f8e565c1d571723bc4a diff --git a/qttools b/qttools index 374ec0ba..5c7b7718 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 374ec0ba691e3cbcd7365778afdb59a7f9eb871d +Subproject commit 5c7b771829c52400ddd8f441972b37ce92da3b78 diff --git a/qtwebengine b/qtwebengine index 1925b1af..2d235e21 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1925b1afb30f119fa6c0733a36d83215b7bac8f7 +Subproject commit 2d235e2112b71e0011c3c31f8d496680091dac66 From b8211774d91aa64e1dcfab7c53135f45c2702878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 10 Apr 2017 07:58:49 +0300 Subject: [PATCH 3/8] Fix provision help script DownloadURL.sh The script neglected the result of the sha1 after download. Even with a failure it exited nicely. Change-Id: I6c0e25c2b764a0ad54acbe317eddf395a56d7f1c Reviewed-by: Heikki Halmet --- coin/provisioning/common/DownloadURL.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coin/provisioning/common/DownloadURL.sh b/coin/provisioning/common/DownloadURL.sh index 9bf7fdb7..305f2675 100644 --- a/coin/provisioning/common/DownloadURL.sh +++ b/coin/provisioning/common/DownloadURL.sh @@ -79,6 +79,10 @@ function DownloadURL { echo "Failed downloading PKG from primary and alternative URLs" exit 1; ;; + $ExceptionSHA1) + echo "Failed checksum on $targetFile." + exit 1; + ;; esac } } From 4b5af2de682541e0077298f22a05f36f80784151 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 11 Apr 2017 16:03:07 +0200 Subject: [PATCH 4/8] Update submodules on '5.9' in qt5 Change-Id: Id6c112e68c465ae52d49f4b35bee648894a35fef Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtspeech | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index 7cbbf942..8eee2733 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7cbbf942972b9619af9442218ff2e16857536fb8 +Subproject commit 8eee273390f9b0d91cb805f1fa7cb51be4717c2b diff --git a/qtbase b/qtbase index 43a5fe25..5ad2e1ce 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 43a5fe258b7f48baad69ac040f395cb597022fa9 +Subproject commit 5ad2e1cea1b2c08950c91174840f542806954d99 diff --git a/qtdeclarative b/qtdeclarative index 452a78d0..3480c2e0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 452a78d0ac4a1579733a8ab641be24c9b7c0dd96 +Subproject commit 3480c2e0565eeb938fb6fb8ba1dad640fb0a0d12 diff --git a/qtgamepad b/qtgamepad index 582bb5d9..c7f84dfc 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 582bb5d97668877e1e2b4a45bf78ad7542771f21 +Subproject commit c7f84dfc27f3afc9a8f4a8bacb8d036d090bb49c diff --git a/qtlocation b/qtlocation index 8714cb31..de46e34c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8714cb31102026f96a3fbf10b8d715319d400536 +Subproject commit de46e34ca67eba6191768338bb87781e65e6a1a1 diff --git a/qtquickcontrols b/qtquickcontrols index da9183da..751f08cf 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit da9183da38513d5531af3753d14d040991e04132 +Subproject commit 751f08cf46f505980b8ebe9a228a6c229b470152 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index dcb0dd86..880475bb 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit dcb0dd861bec6eb61b6bca6dad9399f59a5a1c2c +Subproject commit 880475bbe620a533db7b7b744e0b4c98fbf34d1b diff --git a/qtremoteobjects b/qtremoteobjects index d30914d4..0eaa90b1 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit d30914d4153af3dbf17408879c013dc33dfa6549 +Subproject commit 0eaa90b1245ba2932c895118418ff9dc4d8ab3c0 diff --git a/qtspeech b/qtspeech index b05d4f7c..ed16f6b4 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit b05d4f7c61a454f1eaa2a7465dd2877425d43b2f +Subproject commit ed16f6b4f811cc75a3faf48ed3029b635ae02b08 diff --git a/qtwebengine b/qtwebengine index 2d235e21..fce76602 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2d235e2112b71e0011c3c31f8d496680091dac66 +Subproject commit fce766022b5a66bbfa0ae0bc2755fe018a4e917d From aac3786d67ccbb11e0248c38cf3634f2754a8c0c Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 12 Apr 2017 11:51:08 +0300 Subject: [PATCH 5/8] Add cmake location to PATH when provisioning macOS 10.12 Change-Id: I3afecaefced45704b77b461a2bc2869134567a2e Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh index 7234bf38..de025b55 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh @@ -47,4 +47,5 @@ appPrefix="cmake-3.6.2-Darwin-x86_64" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" +echo "export PATH=/Applications/CMake.app/Contents/bin:$PATH" >> ~/.bashrc echo "CMake = 3.6.2" >> ~/versions.txt From bac199faa3c7bbaa3e51400b72de4171b4dcbd63 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 13 Apr 2017 07:13:47 +0300 Subject: [PATCH 6/8] Update submodules on '5.9' in qt5 Change-Id: Ice64fb51928fda825b63eef8e09f752c4a67395f Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtpurchasing | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtserialbus | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtxmlpatterns | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index 8eee2733..c7eea417 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8eee273390f9b0d91cb805f1fa7cb51be4717c2b +Subproject commit c7eea417418b0d502b8a4acf9ddfc6d01ff29226 diff --git a/qtbase b/qtbase index 5ad2e1ce..fbcdf6d7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5ad2e1cea1b2c08950c91174840f542806954d99 +Subproject commit fbcdf6d7532d62e4e11deda1b6e6aa8f4b9aebaa diff --git a/qtdeclarative b/qtdeclarative index 3480c2e0..1bee1eb0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3480c2e0565eeb938fb6fb8ba1dad640fb0a0d12 +Subproject commit 1bee1eb0f80ca099945e60c113d24f7fa1e0ef29 diff --git a/qtdoc b/qtdoc index 484a663e..a5fd278a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 484a663ee7d516d751f1fc349735b2c79efeb140 +Subproject commit a5fd278a4cd0a2940ab2f2d5a6fa35cb43b1ac9a diff --git a/qtlocation b/qtlocation index de46e34c..453fab84 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit de46e34ca67eba6191768338bb87781e65e6a1a1 +Subproject commit 453fab84c606328811bafd4de9cde5564620fdc6 diff --git a/qtpurchasing b/qtpurchasing index 9a492e0f..2721822a 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 9a492e0f47660b4a428fc1fc6dc0fd07b2b3b1b7 +Subproject commit 2721822a8b51d58b40ffc50892fd6e1c480fa09a diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 880475bb..2e8922b1 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 880475bbe620a533db7b7b744e0b4c98fbf34d1b +Subproject commit 2e8922b144e7308d6895528977b9e94b13b5e902 diff --git a/qtremoteobjects b/qtremoteobjects index 0eaa90b1..6937b932 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 0eaa90b1245ba2932c895118418ff9dc4d8ab3c0 +Subproject commit 6937b9326583f4f4b0812ea93f420a9fd2132b85 diff --git a/qtserialbus b/qtserialbus index e6a10bc0..7785e07d 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit e6a10bc0b5c7be73c5a58f8e565c1d571723bc4a +Subproject commit 7785e07d399a89e023b79fc70a16572efb625f0c diff --git a/qtwebengine b/qtwebengine index fce76602..fa94cb09 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit fce766022b5a66bbfa0ae0bc2755fe018a4e917d +Subproject commit fa94cb09e095a6d6c5634ae8543fc70145594c05 diff --git a/qtwebkit b/qtwebkit index 54110a07..ce29c5f0 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 54110a075ed5eba337e3463d33ad45b538d9365a +Subproject commit ce29c5f019ffe0ceec6eb9be3d82e1c061d0d530 diff --git a/qtxmlpatterns b/qtxmlpatterns index 7c92929b..3a44e86c 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 7c92929b7611d873df34434151fe28ae88daed4f +Subproject commit 3a44e86cdceba7acc6b830274968b0dfa482f5a8 From e48d65315076311b0e371efc4533aacb839b9418 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 12 Apr 2017 14:25:31 +0300 Subject: [PATCH 7/8] Provisioning: Change tier1 templates for Windows 10 These tier 1 templates includes changes needed by 5.9, but we can use these same tier 1 templates for 5.6 also Change-Id: I3ad0d75ab89f7b6502b758fb94f984cc6e0b7f16 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 4 +- coin/platform_configs/qt5.txt | 6 +- .../qtci-windows-10-x86/msvc2015_update.ps1 | 58 +++++++++++++++++++ .../qtci-windows-10-x86/msvc2017.ps1 | 49 ++++++++++++++++ .../msvc2015_update.ps1 | 2 +- .../qtci-windows-10-x86_64/msvc2017.ps1 | 49 ++++++++++++++++ 6 files changed, 162 insertions(+), 6 deletions(-) create mode 100644 coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 72f482d5..ae173eb7 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -6,8 +6,8 @@ qtci-windows-8-x86-2 MSVC2013 qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-7-x86-2 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-10-x86-3 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-10-x86_64-3 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-10-x86-4 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-10-x86_64-5 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-8-x86_64-2 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-windows-8-x86_64-2 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-linux-Ubuntu-14.04-x86_64 GCC NoWidgets ForceDebugInfo diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 3f9f3186..0494e964 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,8 +1,8 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ----------------------------------------------------------------------------------------------- qtci-windows-8-x86_64-2 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64-3 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64-3 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-5 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-5 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-linux-RHEL-6.6-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-2 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2 @@ -12,6 +12,6 @@ qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packagin qtci-windows-7-x86-2 QNX_660 armv7 Mingw49 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 QNX_660 x86 Mingw49 Packaging Release DisableTests OpenGLES2 # target arch is used here only for documentation the value is ignored -qtci-windows-10-x86_64-3 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-5 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-osx-10.11-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 new file mode 100644 index 00000000..fb6a6594 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 @@ -0,0 +1,58 @@ +############################################################################# +## +## 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$ +## +############################################################################# +. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1" + +# Install Visual Studio $version with $update_version +# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs +$version = "2015" +$update_version = "3" + +# Only way to install specific Visual studio release is to use feed.xml. +# Visual Studio $version setup will use the feed.xml that was available when $update_version released -> 'https://msdn.microsoft.com/en-us/library/mt653628.aspx' +# These parameters will install Visual Studio Enterprise Update $update_version (the original Update $update_version without any further Update $update_version-era updates) +$parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BBD3561-D764-4F39-AB8E-05356A122545/20160628.2/enu/feed.xml" + +$msvc_web_installer = "vs" + $version + "_" + $update_version +$package = "C:\Windows\temp\$msvc_web_installer.exe" +$url_cache = "http://ci-files01-hki.ci.local/input/windows/$msvc_web_installer.exe" +$url_official = "https://go.microsoft.com/fwlink/?LinkId=691129" +$sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266" + +echo "Fetching Visual Studio $version update $update_version..." +Download $url_official $url_cache $package +Verify-Checksum $package $sha1 +echo "Installing Visual studio $version update $update_version..." +cmd /c "$package $parameters /norestart /Quiet" +remove-item $package + +echo "Visual Studio = $version update $update_version" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 new file mode 100644 index 00000000..46675c23 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 @@ -0,0 +1,49 @@ +############################################################################ +## +## 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$ +## +############################################################################# + +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script will install Visual Studio 2017 + +$version = "2017" +$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe" +$sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae" +$msvcPackage = "C:\Windows\Temp\$version.exe" + + +Download $url_cache $url_cache $msvcPackage +Verify-Checksum $msvcPackage $sha1 +cmd /c "$msvcPackage --all --norestart --quiet --wait" +echo "Cleaning $msvcPackage.." +Remove-Item -Recurse -Force "$msvcPackage" +echo "Visual Studio = $version" >> ~\versions.txt 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 618c87c4..fb6a6594 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 @@ -30,7 +30,7 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\helpers.ps1" +. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1" # Install Visual Studio $version with $update_version # Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 new file mode 100644 index 00000000..46675c23 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 @@ -0,0 +1,49 @@ +############################################################################ +## +## 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$ +## +############################################################################# + +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script will install Visual Studio 2017 + +$version = "2017" +$url_cache = "http://ci-files01-hki.ci.local/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe" +$sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae" +$msvcPackage = "C:\Windows\Temp\$version.exe" + + +Download $url_cache $url_cache $msvcPackage +Verify-Checksum $msvcPackage $sha1 +cmd /c "$msvcPackage --all --norestart --quiet --wait" +echo "Cleaning $msvcPackage.." +Remove-Item -Recurse -Force "$msvcPackage" +echo "Visual Studio = $version" >> ~\versions.txt From ada6b6601146e01e0736ac5fbc0c1c955489c706 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 14 Apr 2017 20:11:11 +0200 Subject: [PATCH 8/8] Update submodules on '5.9' in qt5 Change-Id: Ib3cb8cae3bbdedbaafe1e5deb3c0ca9252f010d3 Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtserialbus | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index c7eea417..4fb03dc1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c7eea417418b0d502b8a4acf9ddfc6d01ff29226 +Subproject commit 4fb03dc1d50c9638b6045e1d99fbeff863662c2d diff --git a/qtbase b/qtbase index fbcdf6d7..e1c8451f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fbcdf6d7532d62e4e11deda1b6e6aa8f4b9aebaa +Subproject commit e1c8451ffeeaa82f29aa2519addfa377f678ed9e diff --git a/qtconnectivity b/qtconnectivity index 8f09b31d..60d27ebd 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 8f09b31d98d50e9041d294e96eb0726cdf58f4b5 +Subproject commit 60d27ebd2977eee384461469053755c6ba36f102 diff --git a/qtserialbus b/qtserialbus index 7785e07d..0ac7bc6e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 7785e07d399a89e023b79fc70a16572efb625f0c +Subproject commit 0ac7bc6e57be2a7c2ee14bfaf7489e20daf3edc0