From 5035a69e5506d51d14477fae024ea2bcc679c8c5 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 4 Feb 2017 10:40:52 +0100 Subject: [PATCH 01/22] Update qtbase manually Change-Id: I2e9330f0f037bd8637c4391fe5abde613aadc2ea Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 02cc57f4..0e168f2c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 02cc57f4edbae450ecfa8368052afa44f8aeee19 +Subproject commit 0e168f2c4e6f4ce3b98e86d9b140ee9fc3a9cf00 From f65479ee0c1e9cb7463928ab656c60e5c16bd9d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 6 Feb 2017 10:55:06 +0200 Subject: [PATCH 02/22] Upgrade CMake to 3.6.2 on Windows 8 Pyside requires CMake 3.0 or higher Change-Id: Ic3f7eb4e89cd022364b1437fa8ff4476c86c3e47 Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-windows-8-x86/cmake.ps1 | 1 + coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 | 1 + 2 files changed, 2 insertions(+) create mode 100644 coin/provisioning/qtci-windows-8-x86/cmake.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 diff --git a/coin/provisioning/qtci-windows-8-x86/cmake.ps1 b/coin/provisioning/qtci-windows-8-x86/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" From 2835a4d873c19f9171ebd8c8a46a7bf910486544 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Sun, 6 Nov 2016 22:44:29 +0300 Subject: [PATCH 03/22] Upgrade CMake to 3.6.2 on Windows 7 builder Task-number: QTQAINFRA-996 Change-Id: I84867a5b630c4cf1e712047c58c6cad9e5e43800 Reviewed-by: Simon Hausmann (cherry picked from commit daa865312104e7d5d073b0a63e0f50c8a04b9697) --- coin/provisioning/qtci-windows-7-x86/cmake.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 coin/provisioning/qtci-windows-7-x86/cmake.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/cmake.ps1 b/coin/provisioning/qtci-windows-7-x86/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" From 25160f24b6dea4172b482610ca500f961360c787 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Wed, 28 Sep 2016 13:07:43 +0300 Subject: [PATCH 04/22] Upgrade CMake to 3.6.2 QtWebKit requires CMake >= 2.8.12, while only 2.8.11 is available on Windows 10 machines. Task-number: QTQAINFRA-996 Change-Id: I734be4cc36f64dd5aeb243b0fbe4395c75c523b3 Reviewed-by: Simon Hausmann (cherry picked from commit 77eeee64a43c5c448321b8f5ac7b64c872e14489) --- coin/provisioning/common/cmake.ps1 | 10 ++++++++++ coin/provisioning/qtci-windows-10-x86/cmake.ps1 | 1 + coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 | 1 + 3 files changed, 12 insertions(+) create mode 100644 coin/provisioning/common/cmake.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/cmake.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 new file mode 100644 index 00000000..6870f3a7 --- /dev/null +++ b/coin/provisioning/common/cmake.ps1 @@ -0,0 +1,10 @@ +. "$PSScriptRoot\helpers.ps1" + +$zip = "c:\users\qt\downloads\cmake-3.6.2-win32-x86.zip" + +Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-win32-x86.zip $zip +Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" + +Extract-Zip $zip C: +Remove-Item C:\CMake -Force -Recurse +Rename-Item C:\cmake-3.6.2-win32-x86 C:\CMake diff --git a/coin/provisioning/qtci-windows-10-x86/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 new file mode 100644 index 00000000..8dbe0372 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\cmake.ps1" From ad97fd589f14432f74bd4b1cf864f2cfcd877664 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 26 Jan 2017 13:17:19 +0200 Subject: [PATCH 05/22] Provisioning: Visual Studio 2015 with update 3 Common install script for Visual Studio installation and updates. Latest Visual Studio 2015 update is required for releases Change-Id: I5b41625ca7f161b4ba2d417797f8839ef175cdbc Reviewed-by: Simon Hausmann --- coin/provisioning/common/msvc2015_update.ps1 | 58 +++++++++++++++++++ .../06-msvc2015_update.ps1 | 33 +++++++++++ .../06-msvc2015_update.ps1 | 33 +++++++++++ 3 files changed, 124 insertions(+) create mode 100644 coin/provisioning/common/msvc2015_update.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/06-msvc2015_update.ps1 diff --git a/coin/provisioning/common/msvc2015_update.ps1 b/coin/provisioning/common/msvc2015_update.ps1 new file mode 100644 index 00000000..618c87c4 --- /dev/null +++ b/coin/provisioning/common/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\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/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 b/coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 new file mode 100644 index 00000000..83ff3f48 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 @@ -0,0 +1,33 @@ +############################################################################# +## +## 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\msvc2015_update.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/06-msvc2015_update.ps1 b/coin/provisioning/qtci-windows-10-x86_64/06-msvc2015_update.ps1 new file mode 100644 index 00000000..83ff3f48 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/06-msvc2015_update.ps1 @@ -0,0 +1,33 @@ +############################################################################# +## +## 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\msvc2015_update.ps1" From 15e396f7c3c22c5d91fc24d8e401cd92ebf0ecdb Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 8 Feb 2017 09:33:18 +0100 Subject: [PATCH 06/22] Update submodules on '5.8' in qt5 Change-Id: I8c13bd75500b5fe21bde113b40b4e4161b8355f0 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qt3d b/qt3d index 5cdfef0b..69b94b86 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 5cdfef0be44d12bf340b5640e458a73631a4a6f3 +Subproject commit 69b94b86e3141f1204c5a1121e1d289cd6f04a7b diff --git a/qtbase b/qtbase index 0e168f2c..b6bf2a33 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0e168f2c4e6f4ce3b98e86d9b140ee9fc3a9cf00 +Subproject commit b6bf2a33f4c33a212da7b58a049b3b5b20b3f327 diff --git a/qtcharts b/qtcharts index ac91bf79..d920dfad 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit ac91bf7984291f46619415213ce089a33fc3e597 +Subproject commit d920dfad07c671d45af116b0b1816873074f94b5 diff --git a/qtdeclarative b/qtdeclarative index bf19d329..ce15c3af 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bf19d3294f83fc061eddc719bc608bb19e500a5a +Subproject commit ce15c3af57858b9b8b0621398121691b20c6f638 diff --git a/qtlocation b/qtlocation index ee5bf405..d9d36100 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit ee5bf40562aeca6fd861121ab29506cf905189f3 +Subproject commit d9d36100d170ee7cdb04e2782d75e06118934def diff --git a/qtmultimedia b/qtmultimedia index 7c787f11..8d0e08e9 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7c787f11dd2348e0fd2cecc231f15a0acde7481a +Subproject commit 8d0e08e96ffd8cd78fbb4a01f250dfb46117c636 diff --git a/qtnetworkauth b/qtnetworkauth index 212ae9ac..97db61d7 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 212ae9ac4a8c6bd8a74bbe67ffdcc730906bcad6 +Subproject commit 97db61d77432eefbc489d292cc95ed0a4902e77f diff --git a/qtquickcontrols b/qtquickcontrols index 27da25e2..07490d56 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 27da25e24ed44008f7ba303bb7fe8291aa43fd14 +Subproject commit 07490d5610f7a18bbf50f3a5d118c33fb8e88f5d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index f0ce8b84..e6cc5382 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit f0ce8b847e2169ad4ae884dbb35b58e6dd0f1859 +Subproject commit e6cc5382d9b789274d3e16e8601f33075b6a4b1c diff --git a/qtrepotools b/qtrepotools index 7f2dc562..51744f4f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 7f2dc562e3e13640f615c86d700da3b501091f59 +Subproject commit 51744f4f0afd24c38a27505cb2a1feefa4af80ce diff --git a/qtscript b/qtscript index d9d0f0fb..963cefe1 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit d9d0f0fb7857b71c04f6ff8c30e3092a57af1ef4 +Subproject commit 963cefe17376d2b0a4be448d9b025c4e31c579bc diff --git a/qtscxml b/qtscxml index b0031247..bd5dd290 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit b00312476eb182c5cd716559148016558a5889b4 +Subproject commit bd5dd290e5a056d22688a64a58c2a669fed2d085 diff --git a/qtserialbus b/qtserialbus index a13f088f..a0c5dc1b 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit a13f088fab1d2b28778f41a6e8f4c0951061c03f +Subproject commit a0c5dc1bb516e205e10264f8c5dd8b5402d10bfe diff --git a/qtwayland b/qtwayland index 712e7f6d..91f5d6a9 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 712e7f6d96b00f1002a5f833f09ad465332967f0 +Subproject commit 91f5d6a99d5f22334e33624126e881b3228c5ce2 diff --git a/qtwebengine b/qtwebengine index 685366c9..9ff8eda0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 685366c9a3d8d967e072c721c64a365ce50bc531 +Subproject commit 9ff8eda0af657ad504318aebea5349b76fbb107a diff --git a/qtxmlpatterns b/qtxmlpatterns index 57a1b273..f6e5f6ea 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 57a1b273a42746755bbcd93a74245d17afd81625 +Subproject commit f6e5f6eaf2eb958aa043440c8941b25339644360 From da4c2e21b12aea45a1073556e99d492c505ffe94 Mon Sep 17 00:00:00 2001 From: Akseli Salovaara Date: Thu, 15 Dec 2016 09:05:11 +0200 Subject: [PATCH 07/22] Provisioning: Install MySQL x86 and x64 libraries to Windows10 x64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Install both x86 and x64 libraries in order to enable Windows x86 builds on Windows x64 hosts. Environment variables are used by Coin. Change-Id: I8eea51a0bfd05bc72d1d004649211c7bc5901d97 Reviewed-by: Tony Sarajärvi --- .../qtci-windows-10-x86_64/mysql.ps1 | 112 ++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 new file mode 100644 index 00000000..5e75f662 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 @@ -0,0 +1,112 @@ +############################################################################# +## +## 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 installs MySQL $version. +# Both x86 and x64 versions needed when x86 integrations are done on x64 machine + +$version = "5.6.11" +$packagex64 = "C:\Windows\temp\mysql-$version-win64.zip" +$packagex86 = "C:\Windows\temp\mysql-$version-win32.zip" + +function CheckAndRemovePreviousInstallation +{ + Param ( + [string]$InstallFolder + ) + echo "Check for previous installation..." + $FolderExists = Test-Path $ExistingInstallation + If ($FolderExists -eq $True) { + echo "Removing previous installation ($ExistingInstallation)" + Remove-Item $ExistingInstallation -recurse + } +} + +function DownloadAndInstall +{ + Param ( + [string]$arch, + [string]$externalUrl, + [string]$internalUrl, + [string]$package, + [string]$sha1, + [string]$installPath + ) + + echo "Fetching from URL ..." + Download $externalUrl $internalUrl $package + Verify-Checksum $package $sha1 + Extract-Zip $package $installPath +} + +# Install x64 bit version +$architecture = "x64" +$installFolder = "C:\Utils\my_sql" +$existingInstallation = "$installFolder\my_sql" +$internalUrl = "http://ci-files01-hki.ci.local/input/windows/mysql-$version-winx64" +$sha1 = "f4811512b5f3c8ad877ee4feba2062312a0acc38" + +echo "Check and remove previous installation ..." +CheckAndRemovePreviousInstallation $existingInstallation +DownloadAndInstall $architecture $internalUrl $internalUrl $packagex64 $sha1 $installFolder +Rename-Item -path $installFolder\mysql-$version-winx64 -newName $installFolder\my_sql + +echo "Remove downloaded package ..." +Remove-Item $packagex64 + +echo "Set environment variables ..." +[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\my_sql\include", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\my_sql\lib", "Machine") + +# Install x86 bit version +$architecture = "x86" +$installFolder = "C:\Utils\my_sql$architecture" +$existingInstallation = "$installFolder\my_sql" +$internalUrl = "http://ci-files01-hki.ci.local/input/windows/mysql-$version-win32" +$sha1 = "e0aa62d5c5d6c6ec28906a831752d04336562679" + +echo "Check and remove previous installation ..." +CheckAndRemovePreviousInstallation $existingInstallation +DownloadAndInstall $architecture $internalUrl $internalUrl $packagex86 $sha1 $installFolder +Rename-Item -path $installFolder\mysql-$version-win32 -newName $installFolder\my_sql + +echo "Remove downloaded package ..." +Remove-Item $packagex86 + +echo "Set environment variables ..." +[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\my_sql\include", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\my_sql\lib", "Machine") + +# Store version information to ~/versions.txt, which is used to print version information to provision log. +echo "MySQL = $version" >> ~/versions.txt From fb7581847e5be1b60c41cd06e20ade7a4d51ac11 Mon Sep 17 00:00:00 2001 From: Akseli Salovaara Date: Thu, 15 Dec 2016 09:11:48 +0200 Subject: [PATCH 08/22] Provisioning: Install OpenSSL x86 and x64 libraries to Windows 10 x64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Install both x86 and x64 libraries in order to enable Windows x86 builds on Windows x64 hosts. Environment variables are used by Coin. Change-Id: Idada7fc41202298c6f1b2919f0f4343b717e890a Reviewed-by: Tony Sarajärvi --- .../qtci-windows-10-x86_64/openssl.ps1 | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 new file mode 100644 index 00000000..35340ca7 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 @@ -0,0 +1,86 @@ +############################################################################# +## +## 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 installs OpenSSL $version. +# Both x86 and x64 versions needed when x86 integrations are done on x64 machine + +$version = "1_0_2j" +$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe" +$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" + +# Install x64 bit version +$architecture = "x64" +$installFolder = "C:\openssl" +$externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe" +$internalUrl = "http://ci-files01-hki.ci.local/input/openssl/Win64OpenSSL-$version.exe" +$sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44" + +echo "Fetching from URL ..." +Download $externalUrl $internalUrl $packagex64 +Verify-Checksum $packagex64 $sha1 +echo "Installing $packagex64 ..." +cmd /c "$packagex64 /SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" + +echo "Remove downloaded $packagex64 ..." +Remove-Item $packagex64 + +echo "Set $architecture environment variables ..." +[Environment]::SetEnvironmentVariable("OPENSSL_CONF_x64", "$installFolder\bin\openssl.cfg", "Machine") +[Environment]::SetEnvironmentVariable("OPENSSL_INCLUDE_x64", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("OPENSSL_LIB_x64", "$installFolder\lib", "Machine") + +# Install x86 bit version +$architecture = "x86" +$installFolder = "C:\openssl$architecture" +$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe" +$internalUrl = "http://ci-files01-hki.ci.local/input/openssl/Win32OpenSSL-$version.exe" +$sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3" + +echo "Fetching from URL ..." +Download $externalUrl $internalUrl $packagex86 +Verify-Checksum $packagex86 $sha1 +echo "Installing $packagex86 ..." +cmd /c "$packagex86 /SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder" + +echo "Remove downloaded $packagex86 ..." +Remove-Item $packagex86 + +echo "Set $architecture environment variables ..." +[Environment]::SetEnvironmentVariable("OPENSSL_CONF_x86", "$installFolder\bin\openssl.cfg", "Machine") +[Environment]::SetEnvironmentVariable("OPENSSL_INCLUDE_x86", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("OPENSSL_LIB_x86", "$installFolder\lib", "Machine") + +# Store version information to ~/versions.txt, which is used to print version information to provision log. +echo "OpenSSL = $version" >> ~/versions.txt From f1f9b94b00337a4541757f3ae953ead5830e87e1 Mon Sep 17 00:00:00 2001 From: Akseli Salovaara Date: Thu, 15 Dec 2016 09:14:25 +0200 Subject: [PATCH 09/22] Provisioning: Install postgresql x86 and x64 libraries to Windows 10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Install both x86 and x64 libraries in order to enable Windows x86 builds on Windows x64 hosts. Environment variables are used by Coin. Change-Id: Ied654efb2f33ab1c643f38a1ea50a127aeb7af7e Reviewed-by: Tony Sarajärvi --- .../qtci-windows-10-x86_64/postgresql.ps1 | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 new file mode 100644 index 00000000..9b1d5d4e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 @@ -0,0 +1,84 @@ +############################################################################# +## +## 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 installs postgresql $version. +# Both x86 and x64 versions needed when x86 integrations are done on x64 machine + +$version = "9.1.9-1" +$packagex64 = "C:\Windows\temp\postgresql-$version-windows-x64-binaries.zip" +$packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip" + +# Install x64 bit versions +$architecture = "x64" +$installFolder = "C:\Utils\postgresql" +$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip" +$internalUrl = "http://ci-files01-hki.ci.local/input/windows/postgresql-$version-windows-x64-binaries.zip" +$sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd" + +echo "Fetching from URL ..." +Download $externalUrl $internalUrl $packagex64 +Verify-Checksum $packagex64 $sha1 +echo "Installing $packagex64 ..." +Extract-Zip $packagex64 $installFolder + +echo "Remove downloaded $packagex64 ..." +Remove-Item $packagex64 + +echo "Set $architecture environment variables ..." +[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\pgsql\include", "Machine") +[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\pgsql\lib", "Machine") + +# Install x86 bit version +$architecture = "x86" +$installFolder = "C:\Utils\postgresql$architecture" +$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-binaries.zip" +$internalUrl = "http://ci-files01-hki.ci.local/input/windows/postgresql-$version-windows-binaries.zip" +$sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9" + +echo "Fetching from URL..." +Download $externalUrl $internalUrl $packagex86 +Verify-Checksum $packagex86 $sha1 +echo "Installing $packagex86 ..." +Extract-Zip $packagex86 $installFolder + +echo "Remove downloaded $packagex86 ..." +Remove-Item $packagex86 + +echo "Set $architecture environment variables ..." +[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\pgsql\include", "Machine") +[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\pgsql\lib", "Machine") + +# Store version information to ~/versions.txt, which is used to print version information to provision log. +echo "PostgreSQL = $version" >> ~/versions.txt From 880e7506291644ee22c550607e78d655befb68a6 Mon Sep 17 00:00:00 2001 From: Akseli Salovaara Date: Mon, 30 Jan 2017 10:29:06 +0200 Subject: [PATCH 10/22] Provisioning: Update opengl32.dll x86 on Windows 10 x64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OpenGL32 update is needed for autotests to pass. At least tst_qglbuffer vertexBuffer will fail without an update. This update is already in place on Windows x86 and x64 CI hosts but applied only to System32 -folders. Change-Id: I223ffc53ecba77030385f29463c419acdc12e1a3 Reviewed-by: Tony Sarajärvi --- .../qtci-windows-10-x86_64/opengl32_x86.ps1 | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 new file mode 100644 index 00000000..079f26c3 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 @@ -0,0 +1,63 @@ +############################################################################# +## +## 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" + +$version = "11_2_2" +$package = "C:\Windows\temp\opengl32sw_$version.7z" +$destinationFolder = "C:\Windows\SysWOW64" +$openglPackage = "C:\Windows\SysWOW64\opengl32.dll" + +$mesaOpenglUrl = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z" +$mesaOpenglSha1 = "e742e9d4e16b9c69b6d844940861d3ef1748356b" +$openglUrl = "http://ci-files01-hki.ci.local/input/mesa3d/windows/32bit/opengl32.dll" +$openglSha1 = "690730f973aa39bd80648e026248394fde07a753" + +Invoke-WebRequest -UseBasicParsing $mesaOpenglUrl -OutFile $package +Verify-Checksum $package $mesaOpenglSha1 +Get-ChildItem $package | % {& "C:\Utils\sevenzip\7z.exe" "x" "-y" $_.fullname "-o$destinationFolder"} + +echo "Remove downloaded $package ..." +Remove-Item $package -recurse + +echo "Take ownership of existing opengl32.dll from SysWOW64" +takeown /f $openglPackage +icacls $openglPackage /grant Administrators:F +echo "Remove existing opengl32.dll from SysWOW64" +Remove-Item -Recurse -Force $openglPackage +echo "Add new opengl32.dll to SysWOW64" +Invoke-WebRequest -UseBasicParsing $openglUrl -OutFile $openglPackage +Verify-Checksum $openglPackage $openglSha1 + +# Store version information to ~/versions.txt +echo "OpenGL x86 = $version" >> ~/versions.txt From cb78b8cfca08d6d0a78202e7d1ac6596ddbd616a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 10 Feb 2017 20:01:22 +0100 Subject: [PATCH 11/22] Update submodules on '5.6' in qt5 Change-Id: I2b0758eeb79aedf3450e857fc3e29de6d3659d47 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qtwebengine | 2 +- qtx11extras | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index 88e6542e..aad7e955 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 88e6542ecc0451df2f291db928c4d4d549aa0ca2 +Subproject commit aad7e9551573ddf16bfba7a07ce6e24d92dc5483 diff --git a/qtdeclarative b/qtdeclarative index 533f9591..cdbda2e7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 533f9591595c3933ac56a3b3f4422a8aa821cb00 +Subproject commit cdbda2e7bd84e7e41812b811890f017e0538b5b9 diff --git a/qtdoc b/qtdoc index 276dcf86..7672f924 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 276dcf86836507b39c747067de151fb1a31fa527 +Subproject commit 7672f92440e7ba5587583acf8f54128a203f9acc diff --git a/qtimageformats b/qtimageformats index cc0e9432..b6ffd71e 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit cc0e9432848750689e8a9e48e318b5ef9c6874ff +Subproject commit b6ffd71e2315e699d4ad32859cf36c67635820e7 diff --git a/qtqa b/qtqa index 583ae213..1561b922 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 583ae213c1e34a93d01d1872c1a89cc4d7b48838 +Subproject commit 1561b922dfa49c071938f961e2cae7c51d766655 diff --git a/qtrepotools b/qtrepotools index d4c099dd..51744f4f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit d4c099ddd7a6709e89508049485157380ab2dc1c +Subproject commit 51744f4f0afd24c38a27505cb2a1feefa4af80ce diff --git a/qtserialbus b/qtserialbus index d8ae11c7..0c60b2c1 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit d8ae11c7c4bf2cf51653e7f0a34ced8b8c7a7bd7 +Subproject commit 0c60b2c10bd30e1ccb775a3fb406ba1e8214b1c3 diff --git a/qtwebengine b/qtwebengine index b61bb656..9464e7f4 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b61bb656ac1d332da300177b41c1331d1f672c47 +Subproject commit 9464e7f4646ce4bdc8e16c1716bf07345531db28 diff --git a/qtx11extras b/qtx11extras index 7bc18713..25e20a72 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 7bc187133a72911f0257cb4aca63dbeef9408959 +Subproject commit 25e20a724f411f6e07cd3dc9f4870298a308c2c3 From 36bedf10de60909063ad4f3b17043b88a5c9fdf1 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 11 Feb 2017 00:08:44 +0100 Subject: [PATCH 12/22] Update submodules on '5.8' in qt5 Change-Id: If01fe1a84460b65322bfe9d8c402f24d44e98094 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 69b94b86..e29f8cf6 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 69b94b86e3141f1204c5a1121e1d289cd6f04a7b +Subproject commit e29f8cf68e2f1ed22244f84099589e9444eaf5ba diff --git a/qtbase b/qtbase index b6bf2a33..6e8fcab7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b6bf2a33f4c33a212da7b58a049b3b5b20b3f327 +Subproject commit 6e8fcab7e07717526c8ea6eac8785bf27fa090c3 diff --git a/qtdeclarative b/qtdeclarative index ce15c3af..fedcd26c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ce15c3af57858b9b8b0621398121691b20c6f638 +Subproject commit fedcd26ce80451e113b963d09cad97a3d21e4ab8 diff --git a/qtlocation b/qtlocation index d9d36100..84e15908 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d9d36100d170ee7cdb04e2782d75e06118934def +Subproject commit 84e159086d2f5dda899737e1282f760e793e6654 diff --git a/qtquickcontrols b/qtquickcontrols index 07490d56..7b6f5708 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 07490d5610f7a18bbf50f3a5d118c33fb8e88f5d +Subproject commit 7b6f57086bbc64ad2f9be0c75a462120fc031e86 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e6cc5382..146d5403 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e6cc5382d9b789274d3e16e8601f33075b6a4b1c +Subproject commit 146d54036664a3f19c2e6d2119f1a1d4acf55fa1 diff --git a/qtscxml b/qtscxml index bd5dd290..e49fd45c 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit bd5dd290e5a056d22688a64a58c2a669fed2d085 +Subproject commit e49fd45c0947d1b24937517c2d170283eadfc501 diff --git a/qtwayland b/qtwayland index 91f5d6a9..0f07709e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 91f5d6a99d5f22334e33624126e881b3228c5ce2 +Subproject commit 0f07709e4249f8d4de299b3af7c5066f3eaf4fd1 diff --git a/qtwebengine b/qtwebengine index 9ff8eda0..309814bd 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9ff8eda0af657ad504318aebea5349b76fbb107a +Subproject commit 309814bd7a160c44f91bf61c787af555a10a8eed From e8231a46f2281f80d6ee0c9f977281ee0429c6d9 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 14 Feb 2017 20:03:52 +0100 Subject: [PATCH 13/22] Update submodules on '5.8' in qt5 Change-Id: Idb3b5cdd408d20582f10372a0e42e6f63e7a94bc Reviewed-by: Liang Qi --- qtbase | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtrepotools | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 6e8fcab7..5fcdb6c4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6e8fcab7e07717526c8ea6eac8785bf27fa090c3 +Subproject commit 5fcdb6c459ebea5e1762e8ba6f0ea1191e19f523 diff --git a/qtdoc b/qtdoc index 24435fb0..02eaf0cc 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 24435fb0818ddf414de6d753dc5460da34b905f4 +Subproject commit 02eaf0cc58c462a6a5a0bf61dfb4961266b1966a diff --git a/qtlocation b/qtlocation index 84e15908..3995bee7 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 84e159086d2f5dda899737e1282f760e793e6654 +Subproject commit 3995bee767306476993134cb9c42499daf9ed1bc diff --git a/qtrepotools b/qtrepotools index 51744f4f..45a7ada2 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 51744f4f0afd24c38a27505cb2a1feefa4af80ce +Subproject commit 45a7ada21fc00026d23d96277bf910aad451c842 diff --git a/qtwebengine b/qtwebengine index 309814bd..1f8154cd 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 309814bd7a160c44f91bf61c787af555a10a8eed +Subproject commit 1f8154cd473bf57aad59ef1c4cf7c9a3be9a823d diff --git a/qtwebkit b/qtwebkit index a4eec411..c3b710c3 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit a4eec4118333b59d10fd6cc9f126b1af2e8f505c +Subproject commit c3b710c3f4de2da0fd67c858949c3f420dfd175a From 3fb0afb7f98ebb3d392e7e9740616b50127d4189 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 16 Feb 2017 16:00:03 +0100 Subject: [PATCH 14/22] Update qtwebengine manually Change-Id: I86dc97895dbbbff1a14e90d0a7c2ae359ce25891 Reviewed-by: Liang Qi --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index 1f8154cd..4578bc71 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1f8154cd473bf57aad59ef1c4cf7c9a3be9a823d +Subproject commit 4578bc7173caa37f92cffe8f8dee4a5471d88af1 From 7470f97c4e1041c0e02deafb067e76bb9cf02804 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 17 Feb 2017 12:29:49 +0100 Subject: [PATCH 15/22] Update qtwebengine manually again Change-Id: I6fabfa3a4ce0b0fbcb1da2e15bdf5f8f6ac6e643 Reviewed-by: Liang Qi --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index 4578bc71..8666e9d5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 4578bc7173caa37f92cffe8f8dee4a5471d88af1 +Subproject commit 8666e9d50346ce4ae68b577812282b7bc17b41c9 From 2df983757af44964b7df132ed993eca11373adfa Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 17 Feb 2017 20:04:01 +0100 Subject: [PATCH 16/22] Update submodules on '5.8' in qt5 Change-Id: I2a905ff8300b2f64537446ee763202eeed216c6e Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtserialbus | 2 +- qtwayland | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index e29f8cf6..c668bde4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e29f8cf68e2f1ed22244f84099589e9444eaf5ba +Subproject commit c668bde4982ff7340de4e882aa45cf1db93bea98 diff --git a/qtbase b/qtbase index 5fcdb6c4..8d6d68d3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5fcdb6c459ebea5e1762e8ba6f0ea1191e19f523 +Subproject commit 8d6d68d3d363bb6aa1faec2355b32e3ea290116c diff --git a/qtcharts b/qtcharts index d920dfad..f7b477ad 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit d920dfad07c671d45af116b0b1816873074f94b5 +Subproject commit f7b477ad0e2f9ab4f3a95e7547a92dccab7bb836 diff --git a/qtconnectivity b/qtconnectivity index 2eaf5b34..d8817ceb 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 2eaf5b3428f8440de2535be26bb0dee59fd0740d +Subproject commit d8817cebf11c9212f85a5359262d321f3c205c02 diff --git a/qtdeclarative b/qtdeclarative index fedcd26c..7454ad3c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fedcd26ce80451e113b963d09cad97a3d21e4ab8 +Subproject commit 7454ad3ce1895eae7409df28752739cc912abcac diff --git a/qtserialbus b/qtserialbus index a0c5dc1b..2f934cfb 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit a0c5dc1bb516e205e10264f8c5dd8b5402d10bfe +Subproject commit 2f934cfb143df5fccdaab20b2982e54bb13a1bdf diff --git a/qtwayland b/qtwayland index 0f07709e..262efbc3 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 0f07709e4249f8d4de299b3af7c5066f3eaf4fd1 +Subproject commit 262efbc390e58dab4c898a34bb566ea83288601c From e0416f4966a0ed62902dccc10837d9c77a12de74 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 22 Feb 2017 18:12:34 +0100 Subject: [PATCH 17/22] Update submodules on '5.8' in qt5 Change-Id: I81b3b50b87402c49a306d381c2d107fc6d4d91da Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 8d6d68d3..1d44b6be 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8d6d68d3d363bb6aa1faec2355b32e3ea290116c +Subproject commit 1d44b6bedbc50c565487fbda6564f3e81c5d4bd0 diff --git a/qtdeclarative b/qtdeclarative index 7454ad3c..9bca88ea 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7454ad3ce1895eae7409df28752739cc912abcac +Subproject commit 9bca88ea414e68b34eb3f58238b30e47637ab5cc diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 146d5403..e91c9fea 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 146d54036664a3f19c2e6d2119f1a1d4acf55fa1 +Subproject commit e91c9feab8a0cf4cff71cc68ab0f001b1531504f diff --git a/qtwayland b/qtwayland index 262efbc3..7d527c19 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 262efbc390e58dab4c898a34bb566ea83288601c +Subproject commit 7d527c1914710a511c06713bbda1572b767cea34 diff --git a/qtwebengine b/qtwebengine index 8666e9d5..5ff4702e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8666e9d50346ce4ae68b577812282b7bc17b41c9 +Subproject commit 5ff4702ea7e567eecc767a2e40d383a27f4ee4fb diff --git a/qtwebsockets b/qtwebsockets index abc12bf1..d5e2b4bb 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit abc12bf1c2dde5864fcd321ca41bcf2f80874d85 +Subproject commit d5e2b4bba1e19a51780aa68d47771065755883b3 From ed8f84f149f6901cbca50d145b25fe5f43a2d54c Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 21 Feb 2017 18:30:31 +0100 Subject: [PATCH 18/22] declare optional dependency of qtwebengine on qttools starting with 5.7, it optionally comes with a qt designer plugin. Change-Id: Idcc81b2688a1c09d3273b07a1ec991b54903e94c Reviewed-by: Michal Klocek --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index f044480c..6d20dc99 100644 --- a/.gitmodules +++ b/.gitmodules @@ -237,7 +237,7 @@ status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel - recommends = qtlocation + recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git branch = 5.8 From b5e631ad6ff9e8de3603f587e1ea268fc2935dc2 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 23 Feb 2017 20:05:12 +0100 Subject: [PATCH 19/22] Update submodules on '5.8' in qt5 Change-Id: Id5ddefcb8bb28109f75b181e5db41ad98519ffc6 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtrepotools | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 1d44b6be..8e958284 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1d44b6bedbc50c565487fbda6564f3e81c5d4bd0 +Subproject commit 8e9582847506bf17755415fdddd92c242407851c diff --git a/qtdeclarative b/qtdeclarative index 9bca88ea..fe5d6966 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9bca88ea414e68b34eb3f58238b30e47637ab5cc +Subproject commit fe5d69669197a51662061b014810f0242eec5ca7 diff --git a/qtrepotools b/qtrepotools index 45a7ada2..ae6a386f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 45a7ada21fc00026d23d96277bf910aad451c842 +Subproject commit ae6a386fbf52867577d0bf54705fbcecf3197280 diff --git a/qtwebengine b/qtwebengine index 5ff4702e..b70bdb11 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5ff4702ea7e567eecc767a2e40d383a27f4ee4fb +Subproject commit b70bdb111e16d9437f60725f8c2854014a569289 From 6c6169f292476046e62c6c62968ac72a914cb5a3 Mon Sep 17 00:00:00 2001 From: Svintsov Dmitry Date: Thu, 22 Dec 2016 21:03:53 +0500 Subject: [PATCH 20/22] Make top-level configure script more portable Remove hard-coded path to pwd; there is no need to have it, and for example NixOS doesn't actually have it at this location, leading to such an error: ./configure: line 36: /bin/pwd: No such file or directory /qtbase/configure not found. Did you forget to run "init-repository"? Change-Id: If3372db3390ba5f39c5003d12ff2a466f39ff353 Reviewed-by: Oswald Buddenhagen --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index a7b4c9cb..b6954b85 100755 --- a/configure +++ b/configure @@ -33,7 +33,7 @@ ############################################################################# srcpath=`dirname $0` -srcpath=`(cd "$srcpath"; /bin/pwd)` +srcpath=`(cd "$srcpath"; pwd)` configure=$srcpath/qtbase/configure if [ ! -e "$configure" ]; then echo "$configure not found. Did you forget to run \"init-repository\"?" >&2 From 0fdc5369209225943aaa77672706fe9b607e0a89 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 25 Feb 2017 08:51:56 +0100 Subject: [PATCH 21/22] Update submodules on '5.8' in qt5 Change-Id: Icdce897429db6ec02938807bc2add8ae8d9a1ccc Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 8e958284..e3bcab93 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8e9582847506bf17755415fdddd92c242407851c +Subproject commit e3bcab935c9fe37b344394c3ee8afd6773a8cd7e diff --git a/qtdeclarative b/qtdeclarative index fe5d6966..aa0e51be 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fe5d69669197a51662061b014810f0242eec5ca7 +Subproject commit aa0e51beaba1a338db42391c575212b4aac815b1 diff --git a/qtwebengine b/qtwebengine index b70bdb11..714bddf9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b70bdb111e16d9437f60725f8c2854014a569289 +Subproject commit 714bddf9921a4e12f03867118c6a4697083e6a14 From 8de4f42cb62b083cee959ae196eec6c593b3f8ea Mon Sep 17 00:00:00 2001 From: Akseli Salovaara Date: Wed, 1 Mar 2017 18:29:21 +0200 Subject: [PATCH 22/22] Provisioning: Upgrade conan version from 0.16.0 to 0.20.2 Conan provisioning fails on private Coin instance due to error message Could not find a version that satisfies the requirement conan==0.16.0 (from versions: 0.15.0, 0.16.1, 0.17.2, 0.18.1, 0.19.3, 0.20.0, 0.20.1, 0.20.2) No matching distribution found for conan==0.16.0 Upgrading to 0.16.1 resulted warning "Your conan's client version is deprecated for the current remote (v0.20.2). Upgrade conan client." and provisioning failed with "ERROR: All remotes failed" After upgrade to 0.20.2 conan provisioning script is working again. Change-Id: I2fe9d65460954c929abb4822d206dde42909d5b3 Reviewed-by: Konstantin Tokarev --- coin/provisioning/common/03-conan.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/03-conan.ps1 b/coin/provisioning/common/03-conan.ps1 index 04be729d..6a4b4ebb 100644 --- a/coin/provisioning/common/03-conan.ps1 +++ b/coin/provisioning/common/03-conan.ps1 @@ -2,7 +2,7 @@ $scriptsPath = "C:\Python27\Scripts" -& "$scriptsPath\pip.exe" install --upgrade conan==0.16.0 +& "$scriptsPath\pip.exe" install --upgrade conan==0.20.2 [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine")