From 6c295ac7f00f3352a3242b21c90bf3ad1a9fc86a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 15 May 2018 12:35:39 +0300 Subject: [PATCH 1/5] Provisioning: Install 32 bit python to 64 bit windows In order to create 32 bit Pyside wheels we have to be able to link Pyside against 32 bit python. While 32 Qt build is done in 64 bit Windows Pyside must follow. Task-number: PYSIDE-646 Change-Id: I30855d4cecd6bc6219021216e9c296d28c56b405 Reviewed-by: Alexandru Croitor Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/python.ps1 | 28 +++++++++++++------ coin/provisioning/common/windows/python3.ps1 | 25 +++++++++++------ .../02-python-32bit.ps1 | 1 + .../qtci-windows-10-x86_64/08-python3-32.ps1 | 1 + .../qtci-windows-10-x86_64/08-python3.ps1 | 2 +- .../qtci-windows-7-x86_64/25-python.ps1 | 2 +- .../qtci-windows-7-x86_64/25-python3.ps1 | 2 +- .../qtci-windows-8.1-x86_64/08-python3.ps1 | 2 +- 8 files changed, 43 insertions(+), 20 deletions(-) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/02-python-32bit.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 diff --git a/coin/provisioning/common/windows/python.ps1 b/coin/provisioning/common/windows/python.ps1 index 05811c58..e2855c75 100644 --- a/coin/provisioning/common/windows/python.ps1 +++ b/coin/provisioning/common/windows/python.ps1 @@ -30,13 +30,17 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\helpers.ps1" # This script installs Python $version. # Python is required for building Qt 5 from source. +param( + [Int32]$archVer=32, + [string]$targetDir="C:\Python27" +) +. "$PSScriptRoot\helpers.ps1" $version = "2.7.13" -if (Is64BitWinHost) { +if ( $archVer -eq 64 ) { $arch = ".amd64" $sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c" } else { @@ -51,17 +55,25 @@ Write-Host "Fetching from URL..." Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 Write-Host "Installing $package..." -Run-Executable "msiexec" "/passive /i $package ALLUSERS=1" +Run-Executable "msiexec" "/passive /i $package TARGETDIR=$targetDir ALLUSERS=1" # We need to change allowZip64 from 'False' to 'True' to be able to create ZIP files that use the ZIP64 extensions when the zipfile is larger than 2 GB Write-Host "Changing allowZip64 value to 'True'..." -(Get-Content C:\Python27\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content C:\Python27\lib\zipfile.py +(Get-Content $targetDir\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content $targetDir\lib\zipfile.py Write-Host "Remove $package..." Remove-Item -Path $package -Add-Path "C:\Python27;C:\Python27\Scripts" +# When installing 32 bit python to 64 bit host, we want to keep only default python in path +# For cross-compilation we export some helper env variable +if (($archVer -eq 32) -And (Is64BitWinHost)) { + Set-EnvironmentVariable "PYTHON2_32_PATH" "$targetDir" + Set-EnvironmentVariable "PIP2_32_PATH" "$targetDir\Scripts" +} else { + Add-Path "$targetDir;$targetDir\Scripts" +} -Run-Executable "C:\Python27\python.exe" "-m ensurepip" + +Run-Executable "$targetDir\python.exe" "-m ensurepip" # Install python virtual env if (IsProxyEnabled) { @@ -69,6 +81,6 @@ if (IsProxyEnabled) { Write-Host "Using proxy ($proxy) with pip" $pip_args = "--proxy=$proxy" } -Run-Executable "C:\Python27\Scripts\pip.exe" "$pip_args install virtualenv" +Run-Executable "$targetDir\Scripts\pip.exe" "$pip_args install virtualenv" -Write-Output "Python = $version" >> ~/versions.txt +Write-Output "Python-$archVer = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 index d5d5998a..473fe65c 100644 --- a/coin/provisioning/common/windows/python3.ps1 +++ b/coin/provisioning/common/windows/python3.ps1 @@ -32,18 +32,20 @@ ## ############################################################################# -. "$PSScriptRoot\helpers.ps1" - # This script installs Python $version. # Python3 is required for building some qt modules. +param( + [Int32]$archVer=32, + [string]$install_path = "C:\Python36" +) +. "$PSScriptRoot\helpers.ps1" $version = "3.6.1" $package = "C:\Windows\temp\python-$version.exe" -$install_path = "C:\Python36" # check bit version -if (Is64BitWinHost) { - Write-Host "Running in 64 bit system" +if ( $archVer -eq 64 ) { + Write-Host "Installing 64 bit Python" $externalUrl = "https://www.python.org/ftp/python/$version/python-$version-amd64.exe" $internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version-amd64.exe" $sha1 = "bf54252c4065b20f4a111cc39cf5215fb1edccff" @@ -61,8 +63,15 @@ Run-Executable "$package" "/q TargetDir=$install_path" Write-Host "Remove $package..." Remove-Item -Path $package -Set-EnvironmentVariable "PYTHON3_PATH" "$install_path" -Set-EnvironmentVariable "PIP3_PATH" "$install_path\Scripts" +# For cross-compilation we export some helper env variable +if (($archVer -eq 32) -And (Is64BitWinHost)) { + Set-EnvironmentVariable "PYTHON3_32_PATH" "$install_path" + Set-EnvironmentVariable "PIP3_32_PATH" "$install_path\Scripts" +} else { + Set-EnvironmentVariable "PYTHON3_PATH" "$install_path" + Set-EnvironmentVariable "PIP3_PATH" "$install_path\Scripts" +} + # Install python virtual env if (IsProxyEnabled) { @@ -72,5 +81,5 @@ if (IsProxyEnabled) { } Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv" -Write-Output "Python3 = $version" >> ~/versions.txt +Write-Output "Python3-$archVer = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-python-32bit.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-python-32bit.ps1 new file mode 100644 index 00000000..bd2d52c3 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/02-python-32bit.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\python.ps1" 32 "C:\Python27_32" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 new file mode 100644 index 00000000..5ffeab3b --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/08-python3-32.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "C:\Python36_32" diff --git a/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 index 998e6bae..3201032d 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 diff --git a/coin/provisioning/qtci-windows-7-x86_64/25-python.ps1 b/coin/provisioning/qtci-windows-7-x86_64/25-python.ps1 index 3e825ab8..e2e9be9c 100644 --- a/coin/provisioning/qtci-windows-7-x86_64/25-python.ps1 +++ b/coin/provisioning/qtci-windows-7-x86_64/25-python.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\windows\python.ps1" +. "$PSScriptRoot\..\common\windows\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-7-x86_64/25-python3.ps1 b/coin/provisioning/qtci-windows-7-x86_64/25-python3.ps1 index 998e6bae..3201032d 100644 --- a/coin/provisioning/qtci-windows-7-x86_64/25-python3.ps1 +++ b/coin/provisioning/qtci-windows-7-x86_64/25-python3.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 index 998e6bae..3201032d 100644 --- a/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\windows\python3.ps1" +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 From bdbc314b2ae1ef5a0f4850d02c6bb2bdf1005efa Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 2 Jun 2018 03:01:43 +0300 Subject: [PATCH 2/5] Update submodules on '5.11' in qt5 Change-Id: I363b007807ce65746d22ad2e2608aa17c5859deb Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index 6d21a804..6abed231 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6d21a80408bb5a258c5bb6e092a5ad451999789a +Subproject commit 6abed231ae3677e25406d63cc1ad279614acdf3d diff --git a/qtactiveqt b/qtactiveqt index 2045c0fa..71408b68 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2045c0fa98445ee185822579c06e610afa3477ba +Subproject commit 71408b68436445d2d4c556603e33a17db68ea680 diff --git a/qtandroidextras b/qtandroidextras index 82a912b6..e4e20562 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 82a912b656070bb2fd4575f6550f31f25d9c89a1 +Subproject commit e4e20562b4865914ab9639a9e26cfdf9b6640855 diff --git a/qtbase b/qtbase index ccfb309b..73a991cb 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ccfb309b908339d45339f7db084bc6f653757de9 +Subproject commit 73a991cbc3e2a20bc9f90fb793b0ae4d93ac9997 diff --git a/qtcanvas3d b/qtcanvas3d index 3eeb5456..7c97faee 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 3eeb545694657a30a93c9aa8ce49d5015861c119 +Subproject commit 7c97faee9749f0655462671d599a2817c59c28f5 diff --git a/qtcharts b/qtcharts index a164d5e2..ff0281ec 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit a164d5e21aed970a9cd16dd13d233cdc53f01d2d +Subproject commit ff0281ec6a103e2d87fcb3229c682f9c1e456bc5 diff --git a/qtconnectivity b/qtconnectivity index aad6e265..5bdc4e8b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit aad6e26574ff069e080bf6461c0fb7d0fee9e403 +Subproject commit 5bdc4e8b0b1e6664b7c289cfc9c1a9d12da6e87e diff --git a/qtdatavis3d b/qtdatavis3d index 71b6fb32..8a6ec922 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 71b6fb32b11ffe87bc33d564e747785e6a034582 +Subproject commit 8a6ec922d19dc142e653fbe980c8ccbb1cc02011 diff --git a/qtdeclarative b/qtdeclarative index 95b1b468..b7a1bcd8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 95b1b468413c2eeae18b0e698e3e37333c719db4 +Subproject commit b7a1bcd83a8f68185b617b860cef6f2d2d7c8d9b diff --git a/qtdoc b/qtdoc index 26e904f8..96bfc87d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 26e904f883f881f64150bf131319baecaee37838 +Subproject commit 96bfc87db384f10b7e85931268972941f63a0680 diff --git a/qtgamepad b/qtgamepad index 32ce7e8a..c738dcf0 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 32ce7e8af9be26408983b4fb7cf03f9684360954 +Subproject commit c738dcf087a10063b76f3d5f2e4b0b1ab9ba4968 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index a5e792fd..aa020d45 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit a5e792fd3fe214e7ffc368b66305467abfc74f9e +Subproject commit aa020d45c40206fc6ec3fdd4f589fe5d276d2791 diff --git a/qtimageformats b/qtimageformats index 62082a63..470e683f 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 62082a63e112e9991b33c2045896ced78ffcb62e +Subproject commit 470e683fe32af29cc6454c83cc660576d75110fd diff --git a/qtlocation b/qtlocation index 9f5d45c0..c6bfabc9 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 9f5d45c069d631cb573f9572c015217a716412e8 +Subproject commit c6bfabc963cd5e7fdf57bfdac877dccbb7843b0c diff --git a/qtmacextras b/qtmacextras index 3a27add9..dc8ff4eb 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 3a27add9f6d2b4e7065d902274bbf68791ca2f69 +Subproject commit dc8ff4eb7cc81c44a233e71591fbd72389636b2b diff --git a/qtmultimedia b/qtmultimedia index d2786da7..2bd6d429 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d2786da7143b4dc7a7e6ee2e4ba6af9e2efdafe5 +Subproject commit 2bd6d429baa69edc9f4c058196d4e93114fa1e3f diff --git a/qtnetworkauth b/qtnetworkauth index 060c0679..84138b2d 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 060c067960547cc2c129110017b6ccf020e6be6c +Subproject commit 84138b2d18a3afc69997f29d1efcce1b7cc4d1ae diff --git a/qtpurchasing b/qtpurchasing index 0ff95d8a..167bc3f1 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 0ff95d8a8994babfa8f9527d507ff0dd5a6dbed5 +Subproject commit 167bc3f1dce02292fb1e3a70bc30ea7485061dbb diff --git a/qtquickcontrols b/qtquickcontrols index 7eb6f79f..18423f08 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 7eb6f79f5d98be6a0c6aa437b10d927c923ce056 +Subproject commit 18423f0833bcd468797c5eaafd44d3f1e629a5b2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 3599f58d..5eb14618 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 3599f58db538bab4d8d8eeeb655e04b3b42b4ada +Subproject commit 5eb14618525fa0744b78bcc17252155a3cd657b1 diff --git a/qtremoteobjects b/qtremoteobjects index 64769bd6..1d462a79 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 64769bd679eb58c5ce01c16cfe66649deed12bc8 +Subproject commit 1d462a792a17ec1c09b632ea6ad0adad15ad4cbe diff --git a/qtscript b/qtscript index 9d1a9073..e8e5ac15 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 9d1a907345d6a04178b93389803e2d17f090953a +Subproject commit e8e5ac156a029419aee3444766e3805594dd53b8 diff --git a/qtscxml b/qtscxml index c1fa4d09..72e56e84 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit c1fa4d09d7208ba482b513bfc72e49399b0c419c +Subproject commit 72e56e84c5330644d97af8f960248b7948e0cd5b diff --git a/qtsensors b/qtsensors index e8926f54..23ec2153 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e8926f541f38a776a81355f64637b4f520159206 +Subproject commit 23ec215316df6645ed84885a4c32719ba83d64b2 diff --git a/qtserialbus b/qtserialbus index 018fb7c4..28d1853b 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 018fb7c43f1ee795a24bb03adb733f4545a37626 +Subproject commit 28d1853b4b6598ec4f2c91d781efad96c67facac diff --git a/qtserialport b/qtserialport index 7b8f4c83..76583c80 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 7b8f4c839de016d5bf6bec1389655b7cad3b6533 +Subproject commit 76583c805807152360e7b0d90941244b3c8049b2 diff --git a/qtspeech b/qtspeech index 1d8cdb91..2534289d 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 1d8cdb9107dcefb97b4ff344ca58cb49bda1484d +Subproject commit 2534289dc8314123d5accbf0f1e56b63555f3c67 diff --git a/qtsvg b/qtsvg index 14205cb5..2c0df39b 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 14205cb57c9b8464e299dba06d4c3d094902400b +Subproject commit 2c0df39b9db801be9648141cf09a892a24f8cf42 diff --git a/qttools b/qttools index 548a7504..577e6b2c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 548a75049efaa3f9b3087016e3e36cc9b4f23e2e +Subproject commit 577e6b2c2a7a0f241874ac6668a8661814f0d4a4 diff --git a/qttranslations b/qttranslations index c4e341aa..d7a3c73f 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c4e341aaa440d2a8897d16ce641833e33b4e2e26 +Subproject commit d7a3c73fc7f7db62be2c95a891e4617df30a2a60 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 04a5e9e7..5ed830b8 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 04a5e9e77554bc6d7cd43951077514a87bde2e0d +Subproject commit 5ed830b81d76ca96514c3663206286b0a9519741 diff --git a/qtwayland b/qtwayland index 01c566aa..82e6b795 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 01c566aa88eb6debd96390e1968fb18d92367a37 +Subproject commit 82e6b7953841015de040c892fcf53ca3c202d8b8 diff --git a/qtwebchannel b/qtwebchannel index d34f509f..8f704eeb 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit d34f509f6985fc70163c106ca68b8be82eaecc9b +Subproject commit 8f704eeb002ef492697daa2202a39f8001aecdc9 diff --git a/qtwebengine b/qtwebengine index c2e341a7..264fa6b2 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c2e341a705b5d0aaf38e42d52e7c0283a3ec7312 +Subproject commit 264fa6b290db226c32ff25416fcd5a6bc4639fe0 diff --git a/qtwebglplugin b/qtwebglplugin index bb866433..d208810d 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit bb8664336d216e35dd4c066f969de8151b7c3d18 +Subproject commit d208810db23289dc9a4c467a451198145041fd00 diff --git a/qtwebsockets b/qtwebsockets index 9b6f7ca6..91b22321 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 9b6f7ca6512699af41cc602d2092c230612fe78e +Subproject commit 91b2232189524ddce414a7e6ddd07dd43d90b8e7 diff --git a/qtwebview b/qtwebview index a2e74e04..cfa232c2 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit a2e74e04236cb8dfc5460e0357ebd686f5eec19c +Subproject commit cfa232c26b5b68145a305d3a51e83ee03de3a4b9 diff --git a/qtwinextras b/qtwinextras index 0a143e86..78f6c358 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 0a143e866e0663a06cd58f8db8d2e0f29ae28afe +Subproject commit 78f6c358ac3e6690957f499bfd3845ac082f38e8 diff --git a/qtx11extras b/qtx11extras index 335d9f25..91407716 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 335d9f2513bea8dc6ef8e7d3c07f0d288dd7f658 +Subproject commit 914077162f24e6194f004b9bb75d2fc19bb8b950 diff --git a/qtxmlpatterns b/qtxmlpatterns index c69beb78..7c6fe312 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit c69beb789b20945e4d5796769204ae940da6983c +Subproject commit 7c6fe312b00760626035051131a857aa47b4bd68 From 02127d365469e920af1ee524dcf09654b1dd88f4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 5 Jun 2018 03:01:34 +0300 Subject: [PATCH 3/5] Update submodules on '5.11' in qt5 Change-Id: I01ace9bc6ad2805a7a3cdf5b464357e4bad5dc19 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtquickcontrols | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index 73a991cb..23ae05cf 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 73a991cbc3e2a20bc9f90fb793b0ae4d93ac9997 +Subproject commit 23ae05cf6801426daa01b2f3f278fce17b3b86ff diff --git a/qtconnectivity b/qtconnectivity index 5bdc4e8b..6e111b16 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 5bdc4e8b0b1e6664b7c289cfc9c1a9d12da6e87e +Subproject commit 6e111b1631ca43c6c78edf0cf28b943e62cb2804 diff --git a/qtdatavis3d b/qtdatavis3d index 8a6ec922..672028cd 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 8a6ec922d19dc142e653fbe980c8ccbb1cc02011 +Subproject commit 672028cd4db918f9dcf4a583b3874607f35958c4 diff --git a/qtquickcontrols b/qtquickcontrols index 18423f08..191a2fe5 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 18423f0833bcd468797c5eaafd44d3f1e629a5b2 +Subproject commit 191a2fe59cbaf7603d502fa764b4737f49422010 diff --git a/qtscxml b/qtscxml index 72e56e84..1fa64303 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 72e56e84c5330644d97af8f960248b7948e0cd5b +Subproject commit 1fa6430308568a90c3cff6e23d7ee58e97e87574 diff --git a/qtserialbus b/qtserialbus index 28d1853b..da0d7d59 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 28d1853b4b6598ec4f2c91d781efad96c67facac +Subproject commit da0d7d591c9406e436e69def16f74c649956bca0 diff --git a/qtwebglplugin b/qtwebglplugin index d208810d..f1d37773 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit d208810db23289dc9a4c467a451198145041fd00 +Subproject commit f1d37773351996fa62223c4bba577fab3c085ef0 diff --git a/qtwebsockets b/qtwebsockets index 91b22321..1d780dfb 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 91b2232189524ddce414a7e6ddd07dd43d90b8e7 +Subproject commit 1d780dfbffa4f16501597c1679c12144b3f9e62a From e28ed4a3a47d4559cd9b95897dda6ccef9c2cfaf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 6 Jun 2018 03:01:44 +0300 Subject: [PATCH 4/5] Update submodules on '5.11' in qt5 Change-Id: I49fd99ca74e396010e65069e04579daa81b4fab2 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtx11extras | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qtbase b/qtbase index 23ae05cf..314b7184 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 23ae05cf6801426daa01b2f3f278fce17b3b86ff +Subproject commit 314b7184aad09474c6790001b212310ea8993e57 diff --git a/qtconnectivity b/qtconnectivity index 6e111b16..72ead528 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 6e111b1631ca43c6c78edf0cf28b943e62cb2804 +Subproject commit 72ead528a7a1102d147e0b511eaf7ddc3416a162 diff --git a/qtdeclarative b/qtdeclarative index b7a1bcd8..3f5550aa 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b7a1bcd83a8f68185b617b860cef6f2d2d7c8d9b +Subproject commit 3f5550aada22cefe2f5ec22b2a43b24ef07543fd diff --git a/qtlocation b/qtlocation index c6bfabc9..9be1436a 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c6bfabc963cd5e7fdf57bfdac877dccbb7843b0c +Subproject commit 9be1436afa3d6f7345cd761688726abff5721791 diff --git a/qtmultimedia b/qtmultimedia index 2bd6d429..a5bad98e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2bd6d429baa69edc9f4c058196d4e93114fa1e3f +Subproject commit a5bad98efc41b1f437c837bb858fc744ceaddba2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 5eb14618..d09a7a6a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 5eb14618525fa0744b78bcc17252155a3cd657b1 +Subproject commit d09a7a6a344743fc01a34d153d1bd3384e77c1d7 diff --git a/qtscript b/qtscript index e8e5ac15..14c24e36 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit e8e5ac156a029419aee3444766e3805594dd53b8 +Subproject commit 14c24e363af3708b6d212cdad6df8832d7a526d0 diff --git a/qtsensors b/qtsensors index 23ec2153..39dbe667 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 23ec215316df6645ed84885a4c32719ba83d64b2 +Subproject commit 39dbe66791799eab672043159df50392beb22a12 diff --git a/qtserialbus b/qtserialbus index da0d7d59..aaf7f2c9 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit da0d7d591c9406e436e69def16f74c649956bca0 +Subproject commit aaf7f2c99e82b4bfed3b1877401e51f3ec4cceae diff --git a/qtserialport b/qtserialport index 76583c80..ae231fde 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 76583c805807152360e7b0d90941244b3c8049b2 +Subproject commit ae231fde67ee45d992884ea02502e57bcbe6e64d diff --git a/qtsvg b/qtsvg index 2c0df39b..1a869f4a 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 2c0df39b9db801be9648141cf09a892a24f8cf42 +Subproject commit 1a869f4a6f3f37a2bb986be27d394a0e630b38e8 diff --git a/qttools b/qttools index 577e6b2c..d4026593 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 577e6b2c2a7a0f241874ac6668a8661814f0d4a4 +Subproject commit d40265937d6fbd58be4ffd9fe78989506b4089fb diff --git a/qttranslations b/qttranslations index d7a3c73f..3e0de1e1 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit d7a3c73fc7f7db62be2c95a891e4617df30a2a60 +Subproject commit 3e0de1e1cd4fd194d1069b61f57a55b8d23ab60d diff --git a/qtwebchannel b/qtwebchannel index 8f704eeb..9ef5f29c 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 8f704eeb002ef492697daa2202a39f8001aecdc9 +Subproject commit 9ef5f29cce4baea2d7f98104852e0277f3e51148 diff --git a/qtwebengine b/qtwebengine index 264fa6b2..edaef97b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 264fa6b290db226c32ff25416fcd5a6bc4639fe0 +Subproject commit edaef97bc20ae2aff35600110273dc46da0eee8b diff --git a/qtwebglplugin b/qtwebglplugin index f1d37773..eb9e611e 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit f1d37773351996fa62223c4bba577fab3c085ef0 +Subproject commit eb9e611e8cb9196fd0b7ffaca851c6fdd97e7511 diff --git a/qtwebsockets b/qtwebsockets index 1d780dfb..1d2e34e8 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 1d780dfbffa4f16501597c1679c12144b3f9e62a +Subproject commit 1d2e34e85da3c20ee4901ed4ff63162a83c9f403 diff --git a/qtx11extras b/qtx11extras index 91407716..1c36cf75 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 914077162f24e6194f004b9bb75d2fc19bb8b950 +Subproject commit 1c36cf756c90c24ea3fc5c402399891222f79d91 From eb1ca70defc74e6a81888940e2a35d70d3116d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 8 May 2018 15:05:54 +0300 Subject: [PATCH 5/5] Provisioning: Add 64 bit Mingw to coin as packaging target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change will provision DirectX SDK with enabler DotNetFramework also, so that configure for MinGW will detect ANGLE correctly. The DirectX headers and libs will be in two location, while those are installed with MSVC also. Task-number: QTBUG-35288 Change-Id: I04ca71a73b22cd4eb27987a368cd9ede03b0e437 Reviewed-by: Oliver Wolff Reviewed-by: Tony Sarajärvi --- coin/platform_configs/qt5.txt | 1 + .../02-enable-dotnet-framework.ps1 | 22 +++++++++++++++++++ .../09-install-mingw730_64.ps1 | 9 ++++++++ .../qtci-windows-10-x86_64/10-dxsdk.ps1 | 1 + 4 files changed, 33 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730_64.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/10-dxsdk.ps1 diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index ae1f98ae..72ec9b61 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -4,6 +4,7 @@ qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packagin qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 new file mode 100644 index 00000000..e7f4c248 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 @@ -0,0 +1,22 @@ +# The DirectX SDK installer requires .Net framework 3.5 which isn't installed +# by default + +$netFeature = "NetFx3" +try { + $netFeatureState = (Get-WindowsOptionalFeature -Online -FeatureName "$netFeature").State + if ($netFeatureState -eq "Enabled") { + Write-Host ".Net Framework is already installed" + exit 0 + } +} catch { + Write-Host "Could not find .Net Framework Windows feature." + exit 1 +} + +Write-Host "Installing .Net Framework client" +try { + Enable-WindowsOptionalFeature -Online -FeatureName "$netFeature" -All -NoRestart +} catch { + Write-Host "Could not install .Net framework" + exit 1 +} diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730_64.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730_64.ps1 new file mode 100644 index 00000000..c928e270 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730_64.ps1 @@ -0,0 +1,9 @@ +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" + +# This script will install 64-bit MinGW 7.3.0 + +$release = "x86_64-7.3.0-release-posix-seh-rt_v5-rev0" +$sha1 = "0fce15036400568babd10d65b247e9576515da2c" + +InstallMinGW $release $sha1 + diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-dxsdk.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-dxsdk.ps1 new file mode 100644 index 00000000..155df6b8 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/10-dxsdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\dxsdk.ps1"