From c5c23f3eba93472e2d5296255541b4d6af9fd02c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 28 May 2017 20:14:57 +0200 Subject: Update submodules on '5.6' in qt5 Change-Id: I0d0ee51f8952a7739b16f37ae526c14f44fb2ec7 Reviewed-by: Simon Hausmann --- qtbase | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 50d9ee2a..1131db8b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 50d9ee2a4fd8d7b507370043a8deb97c108913ae +Subproject commit 1131db8b4708dfa222b50fb4981a7becaf5ae4a3 diff --git a/qtdeclarative b/qtdeclarative index 2da8e40f..caa273e3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2da8e40fe22396eec158c160ac75ab23d4a0abd8 +Subproject commit caa273e3bc6a2bece76c190b4135103eb7bbeab9 diff --git a/qtqa b/qtqa index b8198f71..a6064652 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit b8198f71d579f488d18e0bb7ef72c10f6a861ef6 +Subproject commit a606465231a4f8e94815e5a6657f608fd283290a diff --git a/qtquickcontrols b/qtquickcontrols index 5db735b1..a1149499 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5db735b193f0520189a2b23a074a9fd62ca8f1f4 +Subproject commit a1149499650fe989016160941a715020aad42893 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 7f0db77f..be77d879 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 7f0db77f030dfa6d20987445df258a665223f641 +Subproject commit be77d8798a1df1cb928b944c145db3fa9aeb9777 diff --git a/qtrepotools b/qtrepotools index 91471704..59e404b2 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 91471704ad8d97bb1d16077e160f23eec45738d3 +Subproject commit 59e404b2f2628ca3f4e8104ec55c7409f9db90f3 diff --git a/qtwebengine b/qtwebengine index cc113790..e4ea5215 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit cc11379001a1a11e4d10709d5e83161d3260f98f +Subproject commit e4ea5215ff40e5e179aeeeaa320e588a25c3ec13 -- cgit v1.2.3 From e78c03197a5c7c9313f3b55d9dece282337a9ee3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 3 Jun 2017 19:52:30 +0300 Subject: Update submodules on '5.6' in qt5 Change-Id: I436caf993701906de211398fe51ce4d2882ad5a0 Reviewed-by: Liang Qi --- qtqa | 2 +- qtquickcontrols | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtqa b/qtqa index a6064652..e8b0477c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit a606465231a4f8e94815e5a6657f608fd283290a +Subproject commit e8b0477c14f74f9e3098d7ba6300ecbce912efef diff --git a/qtquickcontrols b/qtquickcontrols index a1149499..9fc3fcb5 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit a1149499650fe989016160941a715020aad42893 +Subproject commit 9fc3fcb5a827196dee8c7afbd70a4c2361c65107 diff --git a/qtserialbus b/qtserialbus index 0c60b2c1..f5b1c3a3 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 0c60b2c10bd30e1ccb775a3fb406ba1e8214b1c3 +Subproject commit f5b1c3a32b2a7c9bc06b68c469981ae46fb7172e diff --git a/qttools b/qttools index a4f65612..705d06c2 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a4f656126803b6cfac8ac4b442ee975562145b73 +Subproject commit 705d06c2841ef5d9ebda954c112fc8f1e32ec2cb diff --git a/qtwebengine b/qtwebengine index e4ea5215..56f594b1 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e4ea5215ff40e5e179aeeeaa320e588a25c3ec13 +Subproject commit 56f594b1f1750c7bb9917d5e1122233401ff00a2 -- cgit v1.2.3 From 982659b081c73d7ed373dd2845d2a926057b0f83 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 8 May 2017 12:15:40 +0200 Subject: Improve mysql installation * Instead of deleting the files from a previous installation, which will not actually release any disk space but just make the qcow2 file larger, let's just rename the directory the old files are in. That is a significantly faster operation. * When extracting the zip archive, only extract what we need for Qt: Libraries, binaries and headers. We can skip the installation of several thousand documentation files for example, which takes a long time. * Instead of downloading the zip archive via PowerShell's Invoke-WebRequest we can get the data much faster using CopyItem off the CIFS share. As a bonus this is also more robust against download failures. Change-Id: I9128bd70e5f4a4ebcdbf046765e76b63bad033a5 Reviewed-by: Frederik Gladhorn --- coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 | 78 ++++++++++------------ 1 file changed, 34 insertions(+), 44 deletions(-) diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 index 5e75f662..6f2c86a4 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 @@ -37,53 +37,51 @@ # 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" +$packagex64 = "C:\Windows\temp\mysql-$version-winx64.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 + echo "Fetching from URL ..." + Copy-Item $internalUrl $package + + $shell = new-object -com shell.application + + echo "Extracting contents" + foreach ($subDir in "lib", "include", "bin") { + $zipDir = $shell.Namespace($package + "\" + [io.path]::GetFileNameWithoutExtension($package) + "\" + $subDir) + if ($zipDir) { + Write-Host "Extracting $subDir from zip archive" + } else { + Write-Host "$subDir is missing from zip archive - skipping" + continue + } + $destDir = $installPath + "\" + $subdir + New-Item $destDir -type directory + $destinationFolder = $shell.Namespace($destDir) + $destinationFolder.CopyHere($zipDir.Items(), 16) + } + + Remove-Item $package } +# Remove any leftovers +try { + Rename-Item -ErrorAction 'Stop' c:\utils\my_sql c:\utils\mysql_deleted +} catch {} + # 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 +$installFolder = "C:\Utils\my_sql\my_sql" +$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-winx64.zip" -echo "Remove downloaded package ..." -Remove-Item $packagex64 +DownloadAndInstall $internalUrl $packagex64 $installFolder echo "Set environment variables ..." [Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\my_sql\include", "Machine") @@ -91,18 +89,10 @@ echo "Set environment variables ..." # 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 +$installFolder = "C:\Utils\my_sql\my_sql$architecture" +$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-win32.zip" + +DownloadAndInstall $internalUrl $packagex86 $installFolder echo "Set environment variables ..." [Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\my_sql\include", "Machine") -- cgit v1.2.3 From ce47238ed94f3a989c13fef93b037904589910cf Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 8 May 2017 14:28:56 +0200 Subject: Improve Postgresql installation on Windows Similar to the mysql change (parent commit) it's faster to rename any older artifacts and install only what we need. This also generalizes the zip archive extraction code for "dev" packages. Change-Id: I3ad1f23efaed80fab3e0778a3e8c46317138f1ad Reviewed-by: Frederik Gladhorn --- coin/provisioning/common/helpers.ps1 | 32 +++++++++++++++++++++- coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 | 18 ++---------- .../qtci-windows-10-x86_64/postgresql.ps1 | 17 ++++++++---- 3 files changed, 44 insertions(+), 23 deletions(-) diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index 0e684452..132fcdd3 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -30,6 +30,32 @@ function Extract-Zip $destinationFolder.CopyHere($zipfile.Items(), 16) } +function Extract-Dev-Folders-From-Zip +{ + Param ( + [string]$package, + [string]$zipDir, + [string]$installPath + ) + + $shell = new-object -com shell.application + + echo "Extracting contents of $package" + foreach ($subDir in "lib", "include", "bin", "share") { + $zip = $shell.Namespace($package + "\" + $zipDir + "\" + $subDir) + if ($zip) { + Write-Host "Extracting $subDir from zip archive" + } else { + Write-Host "$subDir is missing from zip archive - skipping" + continue + } + $destDir = $installPath + "\" + $subdir + New-Item $destDir -type directory + $destinationFolder = $shell.Namespace($destDir) + $destinationFolder.CopyHere($zip.Items(), 16) + } +} + function BadParam { Param ([string]$Description) @@ -44,7 +70,11 @@ function Download [string] $Destination = $(BadParam("a download target location")) ) try { - Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination + if ($CachedUrl.StartsWith("http")) { + Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination + } else { + Copy-Item $CachedUrl $Destination + } } catch { Invoke-WebRequest -UseBasicParsing $OfficialUrl -OutFile $Destination } diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 index 6f2c86a4..ce1d2be0 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 @@ -51,22 +51,8 @@ function DownloadAndInstall echo "Fetching from URL ..." Copy-Item $internalUrl $package - $shell = new-object -com shell.application - - echo "Extracting contents" - foreach ($subDir in "lib", "include", "bin") { - $zipDir = $shell.Namespace($package + "\" + [io.path]::GetFileNameWithoutExtension($package) + "\" + $subDir) - if ($zipDir) { - Write-Host "Extracting $subDir from zip archive" - } else { - Write-Host "$subDir is missing from zip archive - skipping" - continue - } - $destDir = $installPath + "\" + $subdir - New-Item $destDir -type directory - $destinationFolder = $shell.Namespace($destDir) - $destinationFolder.CopyHere($zipDir.Items(), 16) - } + $zipDir = [io.path]::GetFileNameWithoutExtension($package) + Extract-Dev-Folders-From-Zip $package $zipDir $installPath Remove-Item $package } diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 index 9b1d5d4e..e2edadf0 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 @@ -42,16 +42,21 @@ $packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip" # Install x64 bit versions $architecture = "x64" -$installFolder = "C:\Utils\postgresql" +$installFolder = "C:\Utils\postgresql\pgsql" $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" +$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\postgresql-$version-windows-x64-binaries.zip" $sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd" +# Delete any leftovers +try { + Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted +} catch {} + echo "Fetching from URL ..." Download $externalUrl $internalUrl $packagex64 Verify-Checksum $packagex64 $sha1 echo "Installing $packagex64 ..." -Extract-Zip $packagex64 $installFolder +Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder echo "Remove downloaded $packagex64 ..." Remove-Item $packagex64 @@ -62,16 +67,16 @@ echo "Set $architecture environment variables ..." # Install x86 bit version $architecture = "x86" -$installFolder = "C:\Utils\postgresql$architecture" +$installFolder = "C:\Utils\postgresql$architecture\pgsql" $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" +$internalUrl = "\\ci-files01-hki.ci.local\provisioning\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 +Extract-Dev-Folders-From-Zip $packagex86 "pgsql" $installFolder echo "Remove downloaded $packagex86 ..." Remove-Item $packagex86 -- cgit v1.2.3 From 999b5f5dd7ab11edbb66342b8ecac68532b1486e Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 8 May 2017 16:09:17 +0200 Subject: Speed up Visual Studio update installation We have a prepared package on the internal server that has everything necessary included. This way we do not have to download the actual update content from the internet. Change-Id: Ie4cb3116a4f91a47df5be1c2b2e473d7ddec9a78 Reviewed-by: Frederik Gladhorn Reviewed-by: Aapo Keskimolo --- .../common/msvc_2015_update3_patch.ps1 | 60 ++++++++++++++++++++++ .../msvc_2015_update3_patch.ps1 | 18 +------ .../msvc_2015_update3_patch.ps1 | 18 +------ 3 files changed, 62 insertions(+), 34 deletions(-) create mode 100644 coin/provisioning/common/msvc_2015_update3_patch.ps1 diff --git a/coin/provisioning/common/msvc_2015_update3_patch.ps1 b/coin/provisioning/common/msvc_2015_update3_patch.ps1 new file mode 100644 index 00000000..6a02f6bd --- /dev/null +++ b/coin/provisioning/common/msvc_2015_update3_patch.ps1 @@ -0,0 +1,60 @@ +############################################################################# +## +## 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" + +# Install Cumulative Servicing Release Visual Studio 2015 update 3 +# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx + +$version = "2015 update3 (KB3165756)" +$package = "C:\Windows\Temp\vs14-kb3165756.exe" +$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe" +$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878" +$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02" +$preparedPackage="\\ci-files01-hki.ci.local\provisioning\windows\vs14-kb3165756-update" + +if (Test-Path $preparedPackage) { + echo "Using prepared package" + pushd $preparedPackage + $commandLine = "$preparedPackage\vs14-kb3165756.exe" +} else { + echo "Fetching patch for Visual Studio $version..." + Download $url_official $url_cache $package + Verify-Checksum $package $sha1 + $commandLine = $package +} +echo "Installing patch for Visual Studio $version..." +. $commandLine /norestart /passive + +if ($commandLine.StartsWith("C:\Windows")) { + remove-item $package +} diff --git a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 index f16b5ef4..37af7119 100644 --- a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 @@ -30,21 +30,5 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1" -# Install Cumulative Servicing Release Visual Studio 2015 update 3 -# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx -# http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe - -$version = "2015 update3 (KB3165756)" -$package = "C:\Windows\Temp\vs14-kb3165756.exe" -$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe" -$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878" -$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02" - -echo "Fetching patch for Visual Studio $version..." -Download $url_official $url_cache $package -Verify-Checksum $package $sha1 -echo "Installing patch for Visual Studio $version..." -cmd /c "$package /norestart /Quiet" -remove-item $package diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 index f16b5ef4..37af7119 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 @@ -30,21 +30,5 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" +. "$PSScriptRoot\..\common\msvc_2015_update3_patch.ps1" -# Install Cumulative Servicing Release Visual Studio 2015 update 3 -# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx -# http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe - -$version = "2015 update3 (KB3165756)" -$package = "C:\Windows\Temp\vs14-kb3165756.exe" -$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe" -$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878" -$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02" - -echo "Fetching patch for Visual Studio $version..." -Download $url_official $url_cache $package -Verify-Checksum $package $sha1 -echo "Installing patch for Visual Studio $version..." -cmd /c "$package /norestart /Quiet" -remove-item $package -- cgit v1.2.3 From 038d26308151b5e15394b9a63b274278a2456662 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 8 May 2017 17:09:23 +0200 Subject: Speed up Windows installation of cmake, python, opengl, mysys and Android MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We're better off copying off the internal server using CIFS than using PowerShell's incredibly slow Invoke-WebRequest. Change-Id: Ic39cf08be70335e9309575d543155bffaceb0db0 Reviewed-by: Tony Sarajärvi Reviewed-by: Heikki Halmet --- coin/provisioning/common/cmake.ps1 | 2 +- coin/provisioning/common/python.ps1 | 4 ++-- coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 | 2 +- coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 | 4 ++-- coin/provisioning/qtci-windows-7-x86/04-msys.ps1 | 2 +- coin/provisioning/qtci-windows-7-x86/06-android.ps1 | 4 ++-- coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 index 6870f3a7..88e2a10c 100644 --- a/coin/provisioning/common/cmake.ps1 +++ b/coin/provisioning/common/cmake.ps1 @@ -2,7 +2,7 @@ $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 +Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip \\ci-files01-hki.ci.local\provisioning\cmake\cmake-3.6.2-win32-x86.zip $zip Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" Extract-Zip $zip C: diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 index 3edbc412..ef4be200 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/python.ps1 @@ -43,12 +43,12 @@ $package = "C:\Windows\temp\python-$version.msi" if ( $archVer -eq 64 ) { echo "Running in 64 bit system" $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.amd64.msi" - $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.amd64.msi" + $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\python-$version.amd64.msi" $sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c" } else { $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.msi" - $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.msi" + $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\python-$version.msi" $sha1 = "7e3b54236dbdbea8fe2458db501176578a4d59c0" } diff --git a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 index 079f26c3..fa2c753a 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 @@ -40,7 +40,7 @@ $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" +$openglUrl = "\\ci-files01-hki.ci.local\provisioning\mesa3d\windows\32bit\opengl32.dll" $openglSha1 = "690730f973aa39bd80648e026248394fde07a753" Invoke-WebRequest -UseBasicParsing $mesaOpenglUrl -OutFile $package diff --git a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 index 35340ca7..cd0115d2 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 @@ -44,7 +44,7 @@ $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe" $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" +$internalUrl = "\\ci-files01-hki.ci.local\provisioning\openssl\Win64OpenSSL-$version.exe" $sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44" echo "Fetching from URL ..." @@ -65,7 +65,7 @@ echo "Set $architecture environment variables ..." $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" +$internalUrl = "\\ci-files01-hki.ci.local\provisioning\openssl\Win32OpenSSL-$version.exe" $sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3" echo "Fetching from URL ..." diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 index b75fd2a6..fdb70ef8 100644 --- a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 @@ -3,7 +3,7 @@ # This script will install msys which is needed for configuring openssl for Android $version = "1.0.11" -$url = "http://ci-files01-hki.ci.local/input/windows/msys-$version.7z" +$url = "\\ci-files01-hki.ci.local\provisioning\windows\msys-$version.7z" $zip = "c:\users\qt\downloads\msys-$version.7z" $sha1 = "22cd76f1263db8c72727a9537228c481ff33c285" diff --git a/coin/provisioning/qtci-windows-7-x86/06-android.ps1 b/coin/provisioning/qtci-windows-7-x86/06-android.ps1 index 96be39a3..aa4a4fa5 100644 --- a/coin/provisioning/qtci-windows-7-x86/06-android.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/06-android.ps1 @@ -8,7 +8,7 @@ # NDK $ndkVersion = "r10e" -$ndkCachedUrl = "http://ci-files01-hki.ci.local/input/android/android-ndk-$ndkVersion-windows-x86.zip" +$ndkCachedUrl = "\\ci-files01-hki.ci.local\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip" $ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip" $ndkChecksum = "1d0b8f2835be741f3048fb03c0a3e9f71ab7f357" $ndkFolder = "c:\utils\android-ndk-$ndkVersion" @@ -19,7 +19,7 @@ $sdkVersion = "r24.4.1" $sdkApi = "ANDROID_API_VERSION" $sdkApiLevel = "android-18" $sdkBuildToolsVersion = "23.0.3" -$sdkCachedUrl= "http://ci-files01-hki.ci.local/input/android/android-sdk_$sdkVersion-windows.zip" +$sdkCachedUrl= "\\ci-files01-hki.ci.local\provisioning\android\android-sdk_$sdkVersion-windows.zip" $sdkOfficialUrl = "https://dl.google.com/android/android-sdk_$sdkVersion-windows.zip" $sdkChecksum = "66b6a6433053c152b22bf8cab19c0f3fef4eba49" $sdkFolder = "c:\utils\android-sdk-windows" diff --git a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 index a1b656c6..14a5a085 100644 --- a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 @@ -9,7 +9,7 @@ $zip = "c:\users\qt\downloads\openssl-$version.tar.gz" $sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f" $destination = "C:\Utils\openssl-android-master" -Download https://www.openssl.org/source/openssl-$version.tar.gz http://ci-files01-hki.ci.local/input/openssl/openssl-$version.tar.gz $zip +Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.ci.local\provisioning\openssl\openssl-$version.tar.gz $zip Verify-Checksum $zip $sha1 C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils -- cgit v1.2.3 From 35057fe4b2e4fd1c11a87cc19d4baf673df9e0ad Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 9 May 2017 09:46:31 +0200 Subject: Clean up windows cleanup script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * There's no need to have a numbered prefix in the common directory * Instead of deleting directories trees worth several gigabytes of data, just rename the directory. The underlying storage system is copy-on-write and so deleting the files produces more data than just moving the directory out of the way. Deleting the files does not actually free up any physical disk space. Change-Id: I6de02d56f3485651726ea11183ce7571d5b61520 Reviewed-by: Tony Sarajärvi Reviewed-by: Heikki Halmet --- .../common/01-windows_removethemall.ps1 | 61 ---------------------- coin/provisioning/common/windows_removethemall.ps1 | 61 ++++++++++++++++++++++ .../01-windows_removethemall.ps1 | 2 +- .../01-windows_removethemall.ps1 | 2 +- .../01-windows_removethemall.ps1 | 2 +- .../01-windows_removethemall.ps1 | 2 +- .../01-windows_removethemall.ps1 | 2 +- 7 files changed, 66 insertions(+), 66 deletions(-) delete mode 100644 coin/provisioning/common/01-windows_removethemall.ps1 create mode 100644 coin/provisioning/common/windows_removethemall.ps1 diff --git a/coin/provisioning/common/01-windows_removethemall.ps1 b/coin/provisioning/common/01-windows_removethemall.ps1 deleted file mode 100644 index ebbf15dd..00000000 --- a/coin/provisioning/common/01-windows_removethemall.ps1 +++ /dev/null @@ -1,61 +0,0 @@ -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -Function Remove { -Param ( - [string]$1 - ) - If (Test-Path $1){ - echo "Remove $1" - Remove-Item -Recurse -Force $1 - }Else{ - echo "'$1' does not exists or already removed !!" - } - -} - -Function Remove-Path { - Param ( - [string]$Path - ) - echo "Remove $path from Path" - $name = "Path" - $value = ([System.Environment]::GetEnvironmentVariable("Path").Split(";") | ? {$_ -ne "$path"}) -join ";" - $type = "Machine" - [System.Environment]::SetEnvironmentVariable($name,$value,$type) -} - -# Remove Android sdk and ndk -Remove C:\utils\android* -[Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME",$null,"User") -[Environment]::SetEnvironmentVariable("ANDROID_SDK_HOME",$null,"User") diff --git a/coin/provisioning/common/windows_removethemall.ps1 b/coin/provisioning/common/windows_removethemall.ps1 new file mode 100644 index 00000000..0e584900 --- /dev/null +++ b/coin/provisioning/common/windows_removethemall.ps1 @@ -0,0 +1,61 @@ +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +Function Remove { +Param ( + [string]$1 + ) + If (Test-Path $1){ + echo "Remove $1" + Remove-Item -Recurse -Force $1 + }Else{ + echo "'$1' does not exists or already removed !!" + } + +} + +Function Remove-Path { + Param ( + [string]$Path + ) + echo "Remove $path from Path" + $name = "Path" + $value = ([System.Environment]::GetEnvironmentVariable("Path").Split(";") | ? {$_ -ne "$path"}) -join ";" + $type = "Machine" + [System.Environment]::SetEnvironmentVariable($name,$value,$type) +} + +# Remove Android sdk and ndk +dir c:\utils\android* | ForEach { Rename-Item $_ $_"-deleted" } +[Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME",$null,"User") +[Environment]::SetEnvironmentVariable("ANDROID_SDK_HOME",$null,"User") diff --git a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 index 3bb0af0e..dfca166f 100644 --- a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\01-windows_removethemall.ps1" +. "$PSScriptRoot\..\common\windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 index 3bb0af0e..dfca166f 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\01-windows_removethemall.ps1" +. "$PSScriptRoot\..\common\windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 index 3bb0af0e..dfca166f 100644 --- a/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\01-windows_removethemall.ps1" +. "$PSScriptRoot\..\common\windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 index 3bb0af0e..dfca166f 100644 --- a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 +++ b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\01-windows_removethemall.ps1" +. "$PSScriptRoot\..\common\windows_removethemall.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 index 3bb0af0e..dfca166f 100644 --- a/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 +++ b/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\01-windows_removethemall.ps1" +. "$PSScriptRoot\..\common\windows_removethemall.ps1" -- cgit v1.2.3 From 303d617329ee5b45aa1515404246aef37caee862 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 6 Jun 2017 14:16:47 +0200 Subject: Disable tests on macOS 10.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We cannot run graphical tests reliably on 10.10 anymore with the new virtualization without vmware. As outlined in the referenced task, we occasionally get the Window Server locking up. So for the time being, this change disables testing on 10.10. Task-number: QTQAINFRA-1198 Change-Id: I020d4a298562554838cd7e898df52438db536d7a Reviewed-by: Tor Arne Vestbø --- 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 4ac819c4..2e11cc02 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -15,7 +15,7 @@ qtci-linux-Ubuntu-14.04-x86_64 GCC qtci-linux-OpenSuSE-13.01-x86_64 GCC DeveloperBuild NoPch qtci-linux-RHEL-6.6-x86_64 GCC Packaging Release NoUseGoldLinker qtci-osx-10.11-x86_64 Clang Packaging DebugAndRelease Release -qtci-osx-10.10-x86_64 Clang DebugAndRelease Release +qtci-osx-10.10-x86_64 Clang DebugAndRelease Release DisableTests qtci-osx-10.9-x86_64 Clang DeveloperBuild Release QtNamespace NoPch qtci-osx-10.8-x86_64 Clang Release NoFramework qtci-osx-10.11-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static -- cgit v1.2.3 From 0358b6d28c6a9a23d4faf7d59a7a1f0f1e2732e1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 26 May 2017 19:45:57 +0200 Subject: Remove QNX Windows builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can't get those to work with the faster KVM based VMs, so disable these builds for the time being. Task-number: QTQAINFRA-1208 Change-Id: I74c19374d57e3f84d8f982b95aade4a779623228 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/qt5.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 77668039..8751f38c 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -9,8 +9,6 @@ qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packagin qtci-osx-10.11-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-osx-10.11-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -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-7 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests -- cgit v1.2.3 From 5bc43f0cc3cfe047dcdbe2a293f4ed6885d8a637 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 8 Jun 2017 13:34:20 +0200 Subject: Fix Postgresql and Mysql environment variables The correct paths to the headers are c:\utils\postgresql[x86]\pgsql\include not c:\utils\postgresql[x86]\pgsql\pgsql\include Same for libs. Regression introduced by commit ce47238ed94f3a989c13fef93b037904589910cf but only noticed in the 5.9 branch. Change-Id: Ib16072c0cc1c52f743f5500bc9732c8b04e962c7 Reviewed-by: Frederik Gladhorn --- coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 | 8 ++++---- coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 index ce1d2be0..56b78f47 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 @@ -70,8 +70,8 @@ $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-wi DownloadAndInstall $internalUrl $packagex64 $installFolder echo "Set environment variables ..." -[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\my_sql\include", "Machine") -[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\my_sql\lib", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine") # Install x86 bit version $architecture = "x86" @@ -81,8 +81,8 @@ $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-wi DownloadAndInstall $internalUrl $packagex86 $installFolder echo "Set environment variables ..." -[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\my_sql\include", "Machine") -[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\my_sql\lib", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\lib", "Machine") # Store version information to ~/versions.txt, which is used to print version information to provision log. echo "MySQL = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 index e2edadf0..b73c3778 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 @@ -62,8 +62,8 @@ 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") +[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\lib", "Machine") # Install x86 bit version $architecture = "x86" @@ -82,8 +82,8 @@ 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") +[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\include", "Machine") +[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\lib", "Machine") # Store version information to ~/versions.txt, which is used to print version information to provision log. echo "PostgreSQL = $version" >> ~/versions.txt -- cgit v1.2.3 From 967ba102f382b73e760c3f269d3616ecb0d17ad5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 9 Jun 2017 12:49:29 +0200 Subject: Update submodules on '5.9' in qt5 Change-Id: I2cfafe4529e2eb9f3c18bdc79365f0f306d42891 Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index ab0a43e9..842b8fa5 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ab0a43e9efba3da95da2ebc7662a1437d5e3a899 +Subproject commit 842b8fa5ef41135cc58a98e15d56497482dc5619 diff --git a/qtbase b/qtbase index 5f0ce233..237c867a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5 +Subproject commit 237c867a002c8035aac7ff8a870da717eb7b0878 diff --git a/qtdeclarative b/qtdeclarative index d8f84e57..5efbd716 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d8f84e5769632544dfac5138348481330c4da4cd +Subproject commit 5efbd7165d6867aa376f23c20edcfe49e80518c6 diff --git a/qtlocation b/qtlocation index d89701c5..3e45869d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d89701c5c8646dedb0ebb2e011c4da796a6ae8a1 +Subproject commit 3e45869d8079ace35a2105b20ce4f92d2fa45574 diff --git a/qtqa b/qtqa index e8b0477c..a8269470 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e8b0477c14f74f9e3098d7ba6300ecbce912efef +Subproject commit a8269470a9e21f3e685f25c09e3a92f0ac6615d5 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6b23b6b4..af96b35b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6b23b6b4507b42a96fb3fb7d2315523f54ce1ac0 +Subproject commit af96b35bf4487279357a76bd02a926c1b7f528bb diff --git a/qtscript b/qtscript index ab816ddb..dc65e802 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit ab816ddbfeca2ff6dadca0a31de168f1a5a3f7f4 +Subproject commit dc65e802cae6751b167ada36b45f5b7ec53a1865 diff --git a/qttools b/qttools index 80c13515..ab278766 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 80c135154c1e78c7af7d6d54129e009bc6015c33 +Subproject commit ab27876661e50f48501e72a987936b57b7420367 diff --git a/qtwebengine b/qtwebengine index 1906d4df..532cc891 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1906d4df2146319dcdd5ef71ee26aa0a8ff6fb61 +Subproject commit 532cc891fdad5e329bb31724f527bfba1e2e8a44 diff --git a/qtwebview b/qtwebview index 22e7f194..c795aad0 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 22e7f1941fbbb7aa7212faabf5939b6d2ca7bd49 +Subproject commit c795aad0aa9ff62da8d48dfa4b4c92bd55a18e45 -- cgit v1.2.3 From eb58b173e1fcd2f77adc86ee97796eef7a233c74 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 9 Jun 2017 08:30:28 +0200 Subject: Enforce MinGW developer build MinGW is very sensitive to inlining / export errors, so having a developer build check is valuable. Add a MinGW developer build executing tests to increase coverage and turn off testing for the packaging build in return. Change-Id: Ia4bdacc9952c7a568ac9d4105818eb926c88e6ca Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 2 +- coin/platform_configs/qt5.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index dbd911df..083c2921 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -4,7 +4,7 @@ qtci-windows-8-x86_64-2 MSVC2013 qtci-windows-10-x86_64-7 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix qtci-windows-8-x86-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-7-x86-2 Mingw53 DeveloperBuild Release OpenGLDynamic qtci-windows-10-x86_64-7 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 45fc3fff..924a3bc2 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -4,6 +4,7 @@ qtci-windows-10-x86_64-7 WinRT_10 MSVC2015 Packagin qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-7 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.2-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -- cgit v1.2.3 From 9b0e908aca19d58a0d6b6eefebeb7e184437ada5 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 8 Jun 2017 10:22:26 +0200 Subject: Build examples with MSVC 2015 instead of MSVC 2013 Qt WebEngine does not build with MSVC 2013 anymore, hence the examples from this module weren't tested at all. The 2015 configuration also places the Qt symbols in a namespace, so this adds additional coverage. Change-Id: I395866e8435fbcba33a1b3b4a4a5ccfe82ebad15 Task-number: QTQAINFRA-1271 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 083c2921..ea7b25e5 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,7 +1,7 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-8-x86_64-2 MSVC2013 DeveloperBuild Release BuildExamples -qtci-windows-10-x86_64-7 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix +qtci-windows-8-x86_64-2 MSVC2013 DeveloperBuild Release +qtci-windows-10-x86_64-7 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples qtci-windows-8-x86-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-7-x86-2 Mingw53 DeveloperBuild Release OpenGLDynamic -- cgit v1.2.3 From 52bfe2a9a8ec1e6988965e94c66a04b4c4e479c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 16 Feb 2017 09:33:39 +0200 Subject: Enable autotest for macOS 10.12 Task-number: QTQAINFRA-1093 Change-Id: I21e715b10593d0a9c55b2324c6af8e4bffca0b72 Reviewed-by: Heikki Halmet --- 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 fd29f907..d2328871 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -14,7 +14,7 @@ qtci-linux-Ubuntu-16.04-x86_64 GCC 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 -qtci-macos-10.12-x86_64-8 Clang DebugAndRelease Release DisableTests +qtci-macos-10.12-x86_64-8 Clang DebugAndRelease Release qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch qtci-osx-10.10-x86_64 Clang Packaging DebugAndRelease Release DisableTests qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests -- cgit v1.2.3 From 90cee996177e446531e8f8f899e4da00cad5eb03 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 12 Jun 2017 22:00:46 +0300 Subject: Update submodules on '5.9' in qt5 Change-Id: Ibea2cde30fc92cc089622379068af09e453d8504 Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index 842b8fa5..16612971 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 842b8fa5ef41135cc58a98e15d56497482dc5619 +Subproject commit 166129713819578e7e3a192e8758bc29b200aa92 diff --git a/qtbase b/qtbase index 237c867a..9205110c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 237c867a002c8035aac7ff8a870da717eb7b0878 +Subproject commit 9205110cfe84204c0f8eb2b90f42e9131d27108e diff --git a/qtconnectivity b/qtconnectivity index e5ed5619..3796886c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e5ed5619e6a5ca79474bf922743b6f56bd8058ab +Subproject commit 3796886c20574d23f690d76358139baa386436ab diff --git a/qtdeclarative b/qtdeclarative index 5efbd716..db6f1440 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5efbd7165d6867aa376f23c20edcfe49e80518c6 +Subproject commit db6f1440cbe78018e442c1fb961310a4e619e8fe diff --git a/qtdoc b/qtdoc index dc80adfa..51522bb9 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit dc80adfa2de83ba5b76363c9c0d5a25eed703250 +Subproject commit 51522bb943faa42c9f81b6ec8b3bf2a2ae3e06a7 diff --git a/qtimageformats b/qtimageformats index c1645fee..1b27df8c 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit c1645fee237213074c5b3b53c21e8d9cd3a21167 +Subproject commit 1b27df8c3abc1ded77c1ae4eb70668d2b95920ec diff --git a/qtlocation b/qtlocation index 3e45869d..435ea1ac 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 3e45869d8079ace35a2105b20ce4f92d2fa45574 +Subproject commit 435ea1acaaea0bf5d474b23dcdc9eea2a62a782c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index af96b35b..fe98f10b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit af96b35bf4487279357a76bd02a926c1b7f528bb +Subproject commit fe98f10bc7a3d9e396528965a4d42e89a6d8e7d2 diff --git a/qtremoteobjects b/qtremoteobjects index 68f876f1..e866117b 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 68f876f17b21ec0c95d1e487238f264b5a568c65 +Subproject commit e866117b5a1b7df854a98b9a7a17f1957d33b8c7 diff --git a/qtrepotools b/qtrepotools index 59e404b2..62648ad9 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 59e404b2f2628ca3f4e8104ec55c7409f9db90f3 +Subproject commit 62648ad92d13d29b924fa9dc2419cfb5e812846c diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 21021960..88c57c1a 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 2102196073a045d354e1ff5ea0e00ee4923b948d +Subproject commit 88c57c1ad8b3a388de3359fc152e4354a09f8c0f diff --git a/qtwebengine b/qtwebengine index 532cc891..05f97e2c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 532cc891fdad5e329bb31724f527bfba1e2e8a44 +Subproject commit 05f97e2c14ed667f015809adedcb4628de7206f5 diff --git a/qtxmlpatterns b/qtxmlpatterns index 7aad4fb7..5508d25b 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 7aad4fb7bcd219badbc19b393b6d0aa6192ac8fe +Subproject commit 5508d25baa41d4d16e58b0bdd3365a4eab54c734 -- cgit v1.2.3 From 0dd60236848a4f81be9a8c1b46a9e103975fbaee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 6 Apr 2017 15:58:26 +0300 Subject: Remove provisioning scripts for platforms not supported anymore Change-Id: I8c3685aaf51005f58ba84f695879f82e32a4f689 Reviewed-by: Simon Hausmann --- .../openssl_allow_ssl2.sh | 38 ---------------------- .../qtci-osx-10.8-x86_64/001-crashreporter.sh | 2 -- .../002-disable-screensaver.sh | 26 --------------- .../qtci-osx-10.9-x86_64/001-crashreporter.sh | 2 -- .../002-disable-screensaver.sh | 26 --------------- 5 files changed, 94 deletions(-) delete mode 100755 coin/provisioning/qtci-linux-OpenSuSE-13.01-x86_64/openssl_allow_ssl2.sh delete mode 100644 coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh delete mode 100644 coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh delete mode 100644 coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh delete mode 100644 coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh diff --git a/coin/provisioning/qtci-linux-OpenSuSE-13.01-x86_64/openssl_allow_ssl2.sh b/coin/provisioning/qtci-linux-OpenSuSE-13.01-x86_64/openssl_allow_ssl2.sh deleted file mode 100755 index e958ea87..00000000 --- a/coin/provisioning/qtci-linux-OpenSuSE-13.01-x86_64/openssl_allow_ssl2.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the test suite of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# hack: it seems that opensuse patched their openssl in a way that -# disables ssl 2 without allowing configure's compile detection to work -echo "export OPENSSL_ALLOW_SSL2=1" >>~/.bashrc diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh deleted file mode 100644 index ba8dbdd3..00000000 --- a/coin/provisioning/qtci-osx-10.8-x86_64/001-crashreporter.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh deleted file mode 100644 index 44df94e7..00000000 --- a/coin/provisioning/qtci-osx-10.8-x86_64/002-disable-screensaver.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -mkdir -p $HOME/Library/LaunchAgents -cat >$HOME/Library/LaunchAgents/no-screensaver.plist < - - - - Label - org.qt.io.screensaver_disable - ProgramArguments - - defaults - -currentHost - write - com.apple.screensaver - idleTime - 0 - - RunAtLoad - - KeepAlive - - - -EOT diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh deleted file mode 100644 index ba8dbdd3..00000000 --- a/coin/provisioning/qtci-osx-10.9-x86_64/001-crashreporter.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh deleted file mode 100644 index 44df94e7..00000000 --- a/coin/provisioning/qtci-osx-10.9-x86_64/002-disable-screensaver.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -mkdir -p $HOME/Library/LaunchAgents -cat >$HOME/Library/LaunchAgents/no-screensaver.plist < - - - - Label - org.qt.io.screensaver_disable - ProgramArguments - - defaults - -currentHost - write - com.apple.screensaver - idleTime - 0 - - RunAtLoad - - KeepAlive - - - -EOT -- cgit v1.2.3 From 9781ab911955b5a79748da8d2097d5ca81f6e16c Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 16 Jun 2017 23:40:28 +0200 Subject: Update submodules on '5.9' in qt5 Change-Id: If5a5489690a896422cdc183b520635675d76118b Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index 16612971..6263af19 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 166129713819578e7e3a192e8758bc29b200aa92 +Subproject commit 6263af19264a4d2cb9b0f2ae6d5801438204c601 diff --git a/qtbase b/qtbase index 9205110c..36f21c5b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9205110cfe84204c0f8eb2b90f42e9131d27108e +Subproject commit 36f21c5b560c3036e3e74db8669e8eb0fb14b445 diff --git a/qtconnectivity b/qtconnectivity index 3796886c..4850fe70 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 3796886c20574d23f690d76358139baa386436ab +Subproject commit 4850fe703538088cf3fab129e20d2fad404059d8 diff --git a/qtdeclarative b/qtdeclarative index db6f1440..d2bb2e20 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit db6f1440cbe78018e442c1fb961310a4e619e8fe +Subproject commit d2bb2e202427ebae545a408f065c893f3d837061 diff --git a/qtdoc b/qtdoc index 51522bb9..e62e43a8 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 51522bb943faa42c9f81b6ec8b3bf2a2ae3e06a7 +Subproject commit e62e43a832a6fd68aba43cff0821046d080a5f0b diff --git a/qtlocation b/qtlocation index 435ea1ac..f05bcda6 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 435ea1acaaea0bf5d474b23dcdc9eea2a62a782c +Subproject commit f05bcda6bea40c85edafc8b898629804106ca5e8 diff --git a/qtmultimedia b/qtmultimedia index a6cc1af0..19a5884e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a6cc1af0546ab10701c10475315139ebb50ad1e5 +Subproject commit 19a5884e8d6bfa9d3bdfce359ce39deef4c48110 diff --git a/qtpurchasing b/qtpurchasing index af3addde..d073ccba 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit af3addded493c802e0244b2d0f7d8c71ac811130 +Subproject commit d073ccba69a18113f4c1d58542617e3e33f84896 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index fe98f10b..513363e9 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit fe98f10bc7a3d9e396528965a4d42e89a6d8e7d2 +Subproject commit 513363e940e0978931083544374bfe092107b9fb diff --git a/qtrepotools b/qtrepotools index 62648ad9..b5357f68 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 62648ad92d13d29b924fa9dc2419cfb5e812846c +Subproject commit b5357f68bce6b1f3554745c03295fcc6c47a7e5f diff --git a/qtserialbus b/qtserialbus index 8cec9f47..b919d629 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 8cec9f474af2cf654828b5d47b166da7d3c36574 +Subproject commit b919d62924f0f347c7c356f1cc1b2da55a637e40 diff --git a/qttools b/qttools index ab278766..6ccb19d3 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ab27876661e50f48501e72a987936b57b7420367 +Subproject commit 6ccb19d3608709bd874819049019cb78f1cca017 diff --git a/qtwayland b/qtwayland index 4934b871..8e3518c0 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4934b87156a889584a34e36c22abd9aee64cef7e +Subproject commit 8e3518c0afbca915d4ec1daded13e6c4f95f3231 diff --git a/qtwebengine b/qtwebengine index 05f97e2c..bb3f7ba2 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 05f97e2c14ed667f015809adedcb4628de7206f5 +Subproject commit bb3f7ba2f6d10abde885904eea8bca9bee8554d6 -- cgit v1.2.3 From d4393574f37ea14d6f1b038ed2644031f7a065ea Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 18 Jun 2017 09:44:20 +0300 Subject: Update submodules on '5.9' in qt5 Change-Id: Idfe407e44ed4a659615a711c34570cd99096a502 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index 6263af19..01a6bcd0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6263af19264a4d2cb9b0f2ae6d5801438204c601 +Subproject commit 01a6bcd086cecef3169e5d79bd72dbb0d1393a0f diff --git a/qtactiveqt b/qtactiveqt index 0544c2b4..cd2e41ee 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 0544c2b41fdb0a7d7efc9db701bac561e0edf1f3 +Subproject commit cd2e41ee7935c515addfd3128824ffd0a53aaf5a diff --git a/qtbase b/qtbase index 36f21c5b..8b080e59 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 36f21c5b560c3036e3e74db8669e8eb0fb14b445 +Subproject commit 8b080e59c5019112f5699db5c2c101f76b3da88f diff --git a/qtconnectivity b/qtconnectivity index 4850fe70..1ed8390e 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 4850fe703538088cf3fab129e20d2fad404059d8 +Subproject commit 1ed8390e17831afc5624bc7519b667eb8eea05a7 diff --git a/qtdeclarative b/qtdeclarative index d2bb2e20..1e068513 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d2bb2e202427ebae545a408f065c893f3d837061 +Subproject commit 1e0685136d0debb2a3b62d9f4650c95afe41913b diff --git a/qtmultimedia b/qtmultimedia index 19a5884e..b934cf05 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 19a5884e8d6bfa9d3bdfce359ce39deef4c48110 +Subproject commit b934cf056e3875a13af48eefe519cffe1332cde2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 513363e9..0d851dda 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 513363e940e0978931083544374bfe092107b9fb +Subproject commit 0d851ddab069bd4373e90beacba0efa38ec021bb diff --git a/qtremoteobjects b/qtremoteobjects index e866117b..2ca7b229 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit e866117b5a1b7df854a98b9a7a17f1957d33b8c7 +Subproject commit 2ca7b229f7552c28f906c0efff8a662c06cc2e40 diff --git a/qtwayland b/qtwayland index 8e3518c0..af4d463c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8e3518c0afbca915d4ec1daded13e6c4f95f3231 +Subproject commit af4d463cc8f4f404ffe406f77a01fac5b4be49b7 diff --git a/qtwebengine b/qtwebengine index bb3f7ba2..1eed5a43 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit bb3f7ba2f6d10abde885904eea8bca9bee8554d6 +Subproject commit 1eed5a436c4e9754d922f5ff6e4e4791a3fec27c -- cgit v1.2.3