From 6b243aa27880c6fbdab493b654d60885158f9f0c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 31 May 2018 03:01:28 +0300 Subject: Update submodules on '5.11' in qt5 Change-Id: Ib58c5a24c0398483da71115e049f1cbcfa8732b9 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtserialbus | 2 +- qttranslations | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index 9f27bfb3..ccfb309b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9f27bfb31acfba49a74a342d9249f24633a7ade2 +Subproject commit ccfb309b908339d45339f7db084bc6f653757de9 diff --git a/qtdatavis3d b/qtdatavis3d index 8f049132..71b6fb32 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 8f0491327a24172b55b80adf491c983d141ec777 +Subproject commit 71b6fb32b11ffe87bc33d564e747785e6a034582 diff --git a/qtdeclarative b/qtdeclarative index 2f4b8f15..95b1b468 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2f4b8f159545b545d4b49cb3c1429c09522519ee +Subproject commit 95b1b468413c2eeae18b0e698e3e37333c719db4 diff --git a/qtlocation b/qtlocation index b273e586..9f5d45c0 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b273e586b045c5114e52bc51d80dde9a7276d9ae +Subproject commit 9f5d45c069d631cb573f9572c015217a716412e8 diff --git a/qtserialbus b/qtserialbus index 3fc0d45a..018fb7c4 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 3fc0d45a57181366cd4caf84c87c8467c5a326db +Subproject commit 018fb7c43f1ee795a24bb03adb733f4545a37626 diff --git a/qttranslations b/qttranslations index 0bf644a0..c4e341aa 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 0bf644a075634ca49ee28c0f42566f1012506f31 +Subproject commit c4e341aaa440d2a8897d16ce641833e33b4e2e26 diff --git a/qtwebengine b/qtwebengine index ea28cff7..c2e341a7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ea28cff7524bf0409b43c8ba3ede8fe2f7022ae4 +Subproject commit c2e341a705b5d0aaf38e42d52e7c0283a3ec7312 diff --git a/qtwebview b/qtwebview index 487e0166..a2e74e04 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 487e0166e1c15cc0e068fa17c00757ae260dccc1 +Subproject commit a2e74e04236cb8dfc5460e0357ebd686f5eec19c -- cgit v1.2.3 From b4b1bfe1a6a3754f5f3c81ea8983f66b05f73e50 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 1 Jun 2018 13:33:15 +0200 Subject: Adjust submodule branches Change-Id: I9c6e8ecf1798041b1d2524cb80be936b56216e47 --- .gitmodules | 80 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 565896cc..91fc6e40 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.11 + branch = 5.11.1 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.11 + branch = 5.11.1 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.11 + branch = 5.11.1 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.11 + branch = 5.11.1 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.11 + branch = 5.11.1 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.11 + branch = 5.11.1 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.11 + branch = 5.11.1 status = essential priority = 40 [submodule "qtrepotools"] @@ -81,14 +81,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtsystems"] depends = qtbase @@ -121,27 +121,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtquick1"] depends = qtscript @@ -154,51 +154,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.11 + branch = 5.11.1 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -211,108 +211,108 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.11 + branch = 5.11.1 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.11 + branch = 5.11.1 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.11 + branch = 5.11.1 status = preview [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.11 + branch = 5.11.1 status = preview -- cgit v1.2.3 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: 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 ++++++++++++------- .../qtci-windows-10-x86_64/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 -- cgit v1.2.3 From bdbc314b2ae1ef5a0f4850d02c6bb2bdf1005efa Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 2 Jun 2018 03:01:43 +0300 Subject: 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 -- cgit v1.2.3 From 02127d365469e920af1ee524dcf09654b1dd88f4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 5 Jun 2018 03:01:34 +0300 Subject: 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 -- cgit v1.2.3 From e28ed4a3a47d4559cd9b95897dda6ccef9c2cfaf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 6 Jun 2018 03:01:44 +0300 Subject: 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 -- cgit v1.2.3 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: 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" -- cgit v1.2.3 From 4ab6c1dace20df2a08e7939c3e32dc6a2ea0e2d3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 Jun 2018 18:38:03 +0300 Subject: Update submodules on '5.11.1' in qt5 Change-Id: Ia0779127ef3859678ef194b0af2e4fdb5b25d9f5 Reviewed-by: Jani Heikkinen --- 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..717cc8fa 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2045c0fa98445ee185822579c06e610afa3477ba +Subproject commit 717cc8fa56b1eb39a372d0c5c561aa30dbbbdd47 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..fc5da399 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ccfb309b908339d45339f7db084bc6f653757de9 +Subproject commit fc5da399c3145621c5945d53dde7b37fa463c6e9 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..72ead528 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit aad6e26574ff069e080bf6461c0fb7d0fee9e403 +Subproject commit 72ead528a7a1102d147e0b511eaf7ddc3416a162 diff --git a/qtdatavis3d b/qtdatavis3d index 71b6fb32..672028cd 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 71b6fb32b11ffe87bc33d564e747785e6a034582 +Subproject commit 672028cd4db918f9dcf4a583b3874607f35958c4 diff --git a/qtdeclarative b/qtdeclarative index 95b1b468..14c64a5b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 95b1b468413c2eeae18b0e698e3e37333c719db4 +Subproject commit 14c64a5b53b23d3caf7d8f603cac6ebc05f4186f diff --git a/qtdoc b/qtdoc index 26e904f8..d6686a57 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 26e904f883f881f64150bf131319baecaee37838 +Subproject commit d6686a578debb0a235baeb4b626bc931c7695780 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..8a309a90 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 62082a63e112e9991b33c2045896ced78ffcb62e +Subproject commit 8a309a90a3ec8db92ff2720a8e49acb232a5cfd7 diff --git a/qtlocation b/qtlocation index 9f5d45c0..1768efa1 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 9f5d45c069d631cb573f9572c015217a716412e8 +Subproject commit 1768efa1761ec8fb54a734a4297a29b3d591d8ae 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..a5bad98e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d2786da7143b4dc7a7e6ee2e4ba6af9e2efdafe5 +Subproject commit a5bad98efc41b1f437c837bb858fc744ceaddba2 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..191a2fe5 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 7eb6f79f5d98be6a0c6aa437b10d927c923ce056 +Subproject commit 191a2fe59cbaf7603d502fa764b4737f49422010 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 3599f58d..d09a7a6a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 3599f58db538bab4d8d8eeeb655e04b3b42b4ada +Subproject commit d09a7a6a344743fc01a34d153d1bd3384e77c1d7 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..14c24e36 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 9d1a907345d6a04178b93389803e2d17f090953a +Subproject commit 14c24e363af3708b6d212cdad6df8832d7a526d0 diff --git a/qtscxml b/qtscxml index c1fa4d09..1fa64303 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit c1fa4d09d7208ba482b513bfc72e49399b0c419c +Subproject commit 1fa6430308568a90c3cff6e23d7ee58e97e87574 diff --git a/qtsensors b/qtsensors index e8926f54..39dbe667 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e8926f541f38a776a81355f64637b4f520159206 +Subproject commit 39dbe66791799eab672043159df50392beb22a12 diff --git a/qtserialbus b/qtserialbus index 018fb7c4..aaf7f2c9 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 018fb7c43f1ee795a24bb03adb733f4545a37626 +Subproject commit aaf7f2c99e82b4bfed3b1877401e51f3ec4cceae diff --git a/qtserialport b/qtserialport index 7b8f4c83..ae231fde 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 7b8f4c839de016d5bf6bec1389655b7cad3b6533 +Subproject commit ae231fde67ee45d992884ea02502e57bcbe6e64d 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..1a869f4a 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 14205cb57c9b8464e299dba06d4c3d094902400b +Subproject commit 1a869f4a6f3f37a2bb986be27d394a0e630b38e8 diff --git a/qttools b/qttools index 548a7504..d4026593 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 548a75049efaa3f9b3087016e3e36cc9b4f23e2e +Subproject commit d40265937d6fbd58be4ffd9fe78989506b4089fb diff --git a/qttranslations b/qttranslations index c4e341aa..3e0de1e1 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c4e341aaa440d2a8897d16ce641833e33b4e2e26 +Subproject commit 3e0de1e1cd4fd194d1069b61f57a55b8d23ab60d 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..45b4c8cb 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 01c566aa88eb6debd96390e1968fb18d92367a37 +Subproject commit 45b4c8cb23aa0ca90980c09f183b4815109ff514 diff --git a/qtwebchannel b/qtwebchannel index d34f509f..9ef5f29c 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit d34f509f6985fc70163c106ca68b8be82eaecc9b +Subproject commit 9ef5f29cce4baea2d7f98104852e0277f3e51148 diff --git a/qtwebengine b/qtwebengine index c2e341a7..231ec324 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c2e341a705b5d0aaf38e42d52e7c0283a3ec7312 +Subproject commit 231ec324472b3f279bab61d22f3f82cfc0de8b7d diff --git a/qtwebglplugin b/qtwebglplugin index bb866433..eb9e611e 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit bb8664336d216e35dd4c066f969de8151b7c3d18 +Subproject commit eb9e611e8cb9196fd0b7ffaca851c6fdd97e7511 diff --git a/qtwebsockets b/qtwebsockets index 9b6f7ca6..1d2e34e8 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 9b6f7ca6512699af41cc602d2092c230612fe78e +Subproject commit 1d2e34e85da3c20ee4901ed4ff63162a83c9f403 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..1c36cf75 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 335d9f2513bea8dc6ef8e7d3c07f0d288dd7f658 +Subproject commit 1c36cf756c90c24ea3fc5c402399891222f79d91 diff --git a/qtxmlpatterns b/qtxmlpatterns index c69beb78..73c6356d 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit c69beb789b20945e4d5796769204ae940da6983c +Subproject commit 73c6356de441e0a0e59a4e4a7b59640d5b56e8db -- cgit v1.2.3 From cca980f40184a8eb15fa98442d46e1f275fc76bf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 8 Jun 2018 13:26:35 +0200 Subject: Update submodules on '5.11.1' in qt5 Change-Id: I54afe311c809984962f9644830899e00d1766f96 Reviewed-by: Liang Qi --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index 231ec324..8483cfa6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 231ec324472b3f279bab61d22f3f82cfc0de8b7d +Subproject commit 8483cfa6b039feb780995cee2f3b0878b131fa1d -- cgit v1.2.3 From bfda8d1f253d0282f48d7cb6b4a5046dc973bf32 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 9 Jun 2018 03:01:36 +0300 Subject: Update submodules on '5.11' in qt5 Change-Id: I3b6197f122aaeca5eb1838db41d3fb864eb4043a Reviewed-by: Qt Submodule Update Bot --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 71408b68..717cc8fa 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 71408b68436445d2d4c556603e33a17db68ea680 +Subproject commit 717cc8fa56b1eb39a372d0c5c561aa30dbbbdd47 diff --git a/qtbase b/qtbase index 314b7184..dbad7bd2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 314b7184aad09474c6790001b212310ea8993e57 +Subproject commit dbad7bd2345df603a98d7cd35fceb2e9c1998250 diff --git a/qtdeclarative b/qtdeclarative index 3f5550aa..7f3204ea 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3f5550aada22cefe2f5ec22b2a43b24ef07543fd +Subproject commit 7f3204ea7ba7836907b2d3eeefc51912c1c8c54b diff --git a/qtdoc b/qtdoc index 96bfc87d..d6686a57 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 96bfc87db384f10b7e85931268972941f63a0680 +Subproject commit d6686a578debb0a235baeb4b626bc931c7695780 diff --git a/qtimageformats b/qtimageformats index 470e683f..8a309a90 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 470e683fe32af29cc6454c83cc660576d75110fd +Subproject commit 8a309a90a3ec8db92ff2720a8e49acb232a5cfd7 diff --git a/qtlocation b/qtlocation index 9be1436a..71bc98bf 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 9be1436afa3d6f7345cd761688726abff5721791 +Subproject commit 71bc98bf309ce433afb80344a7356e13b310c5c5 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d09a7a6a..08437d52 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d09a7a6a344743fc01a34d153d1bd3384e77c1d7 +Subproject commit 08437d525a168df9abbda74d5b5ffddfd2841702 diff --git a/qtwayland b/qtwayland index 82e6b795..590d2e31 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 82e6b7953841015de040c892fcf53ca3c202d8b8 +Subproject commit 590d2e313c5a10dc9c7d61a654ada451e5df82aa diff --git a/qtwebengine b/qtwebengine index edaef97b..231ec324 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit edaef97bc20ae2aff35600110273dc46da0eee8b +Subproject commit 231ec324472b3f279bab61d22f3f82cfc0de8b7d diff --git a/qtxmlpatterns b/qtxmlpatterns index 7c6fe312..73c6356d 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 7c6fe312b00760626035051131a857aa47b4bd68 +Subproject commit 73c6356de441e0a0e59a4e4a7b59640d5b56e8db -- cgit v1.2.3 From a25629abfb91b4390cf85c5f9e4dfa154d03109c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 10 Jun 2018 15:04:17 +0300 Subject: Update submodules on '5.11.1' in qt5 Change-Id: Ibc6aaaa9d4de853685695d192495e98d98d81082 Reviewed-by: Liang Qi --- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtnetworkauth | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qtbase b/qtbase index fc5da399..89f9a3db 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fc5da399c3145621c5945d53dde7b37fa463c6e9 +Subproject commit 89f9a3db15940ea87d6ad89f93bfa5aa1d7564fb diff --git a/qtcanvas3d b/qtcanvas3d index 7c97faee..cab02f14 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 7c97faee9749f0655462671d599a2817c59c28f5 +Subproject commit cab02f1401ef10a06929c3681e45c57a02e15bec diff --git a/qtconnectivity b/qtconnectivity index 72ead528..c7f826f0 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 72ead528a7a1102d147e0b511eaf7ddc3416a162 +Subproject commit c7f826f0c07c05948c3882242ce4d2ea0ced8a6f diff --git a/qtdoc b/qtdoc index d6686a57..224b5e80 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d6686a578debb0a235baeb4b626bc931c7695780 +Subproject commit 224b5e80d6c54a895b9715711845673924b39c1c diff --git a/qtimageformats b/qtimageformats index 8a309a90..e945d172 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 8a309a90a3ec8db92ff2720a8e49acb232a5cfd7 +Subproject commit e945d172fef9ae8d3ce2d925c53316a3433ce034 diff --git a/qtnetworkauth b/qtnetworkauth index 84138b2d..c4b57f78 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 84138b2d18a3afc69997f29d1efcce1b7cc4d1ae +Subproject commit c4b57f78900fdb21a8dd99cf8045f5c678eb656c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d09a7a6a..5d482466 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d09a7a6a344743fc01a34d153d1bd3384e77c1d7 +Subproject commit 5d482466d1cfa3292e01edacc429addbbd9fec29 diff --git a/qtscxml b/qtscxml index 1fa64303..de31ea0e 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 1fa6430308568a90c3cff6e23d7ee58e97e87574 +Subproject commit de31ea0edc5ed6511bf635aa75f5d5c6f9aedc94 diff --git a/qtserialbus b/qtserialbus index aaf7f2c9..a59be66a 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit aaf7f2c99e82b4bfed3b1877401e51f3ec4cceae +Subproject commit a59be66ab8b74f074f171b8fe4b75368483a8d4e diff --git a/qtserialport b/qtserialport index ae231fde..1926ea36 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit ae231fde67ee45d992884ea02502e57bcbe6e64d +Subproject commit 1926ea36a923088e8765fb37f0c3a76fcfbc4994 diff --git a/qttools b/qttools index d4026593..a01f3629 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d40265937d6fbd58be4ffd9fe78989506b4089fb +Subproject commit a01f3629377f25506d523406d2b93ffbff711a51 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 5ed830b8..62dad13b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 5ed830b81d76ca96514c3663206286b0a9519741 +Subproject commit 62dad13b1fb2fcf04c61700d3c477b998db2f63e diff --git a/qtwayland b/qtwayland index 45b4c8cb..3ffa7d5d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 45b4c8cb23aa0ca90980c09f183b4815109ff514 +Subproject commit 3ffa7d5d6ecb75c244c6b22565df5184c638643a diff --git a/qtwebglplugin b/qtwebglplugin index eb9e611e..c40e4790 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit eb9e611e8cb9196fd0b7ffaca851c6fdd97e7511 +Subproject commit c40e4790835bd91a36bb19183d0799ff56555964 diff --git a/qtwebsockets b/qtwebsockets index 1d2e34e8..d99ae2d5 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 1d2e34e85da3c20ee4901ed4ff63162a83c9f403 +Subproject commit d99ae2d542515cf53faa5998c1a8e6b9204a6470 -- cgit v1.2.3 From bd8fe6a46340097b8652285fe05ff4a8c60c141e Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Wed, 13 Jun 2018 11:35:09 +0200 Subject: Provisioning: Fix downloading from github MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Invoke-WebRequest uses TLS1.0 by default, which is not accepted by Github anymore, causing all downloads from that site to fail. Upgrade to 1.2 to get downloads working again. Change-Id: Ie242432937c273db5c345b38482dd74c19c3b4ca Reviewed-by: Tony Sarajärvi Reviewed-by: Aapo Keskimolo --- coin/provisioning/common/windows/helpers.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index 28ccaeaf..794f1b5d 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -87,6 +87,7 @@ function Download [string] $Destination = $(BadParam("a download target location")) ) $ProgressPreference = 'SilentlyContinue' + [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 try { Write-Host "Downloading from cached location ($CachedUrl) to $Destination" if ($CachedUrl.StartsWith("http")) { -- cgit v1.2.3 From 32eee8f17a24305ddf33e9ca5821f4cdaa1483cd Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 15 Jun 2018 17:28:35 +0300 Subject: Update submodules on '5.11.1' in qt5 Change-Id: I1b1caa12ea3b4e6c36b2051d88ad8492d17d06cf Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtsensors | 2 +- qtspeech | 2 +- qtsvg | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/qt3d b/qt3d index 6abed231..3b4a9b50 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6abed231ae3677e25406d63cc1ad279614acdf3d +Subproject commit 3b4a9b50618210c08dc08ae0e2dcf3b8d495eccf diff --git a/qtactiveqt b/qtactiveqt index 717cc8fa..976ca67d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 717cc8fa56b1eb39a372d0c5c561aa30dbbbdd47 +Subproject commit 976ca67d36c71bd20a211e6f4c66fce4ebff43dc diff --git a/qtandroidextras b/qtandroidextras index e4e20562..5a0291ff 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit e4e20562b4865914ab9639a9e26cfdf9b6640855 +Subproject commit 5a0291ff26b2ce55a61c4181f99525ba60309917 diff --git a/qtbase b/qtbase index 89f9a3db..74305ba4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 89f9a3db15940ea87d6ad89f93bfa5aa1d7564fb +Subproject commit 74305ba470f48da8b4c4e806fc714fe9f7649156 diff --git a/qtcharts b/qtcharts index ff0281ec..2ad3020d 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit ff0281ec6a103e2d87fcb3229c682f9c1e456bc5 +Subproject commit 2ad3020dfee0af78bf4e3f90fd43b6d45679b468 diff --git a/qtdatavis3d b/qtdatavis3d index 672028cd..3b44cb4c 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 672028cd4db918f9dcf4a583b3874607f35958c4 +Subproject commit 3b44cb4c0ae44deb6d5d941038fd9a2348aa8d01 diff --git a/qtdeclarative b/qtdeclarative index 14c64a5b..68e282f5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 14c64a5b53b23d3caf7d8f603cac6ebc05f4186f +Subproject commit 68e282f510d5f5ee490ffdb0500f90e0932b8cef diff --git a/qtdoc b/qtdoc index 224b5e80..dfabe730 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 224b5e80d6c54a895b9715711845673924b39c1c +Subproject commit dfabe730171864697c04981ae346c86bb460270b diff --git a/qtgamepad b/qtgamepad index c738dcf0..4d393b92 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit c738dcf087a10063b76f3d5f2e4b0b1ab9ba4968 +Subproject commit 4d393b920d984ec763c89e3fce7aab6d1af344fd diff --git a/qtgraphicaleffects b/qtgraphicaleffects index aa020d45..e954783b 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit aa020d45c40206fc6ec3fdd4f589fe5d276d2791 +Subproject commit e954783bd9cdf490a7ffb2a9dc02f1031890d4ea diff --git a/qtlocation b/qtlocation index 1768efa1..f8a0ae91 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 1768efa1761ec8fb54a734a4297a29b3d591d8ae +Subproject commit f8a0ae9109c2ee56a0480cbe62f07239afb31392 diff --git a/qtmacextras b/qtmacextras index dc8ff4eb..c709a157 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit dc8ff4eb7cc81c44a233e71591fbd72389636b2b +Subproject commit c709a15718ab93c93b90c9cbbdea32df0151deff diff --git a/qtmultimedia b/qtmultimedia index a5bad98e..dfefe794 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a5bad98efc41b1f437c837bb858fc744ceaddba2 +Subproject commit dfefe794b9d87fd04c9a529e1ca0aa1d18d44ddd diff --git a/qtpurchasing b/qtpurchasing index 167bc3f1..1e9e0c38 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 167bc3f1dce02292fb1e3a70bc30ea7485061dbb +Subproject commit 1e9e0c388920af7e56fa9fb0fef81e23e9807062 diff --git a/qtremoteobjects b/qtremoteobjects index 1d462a79..cc454911 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 1d462a792a17ec1c09b632ea6ad0adad15ad4cbe +Subproject commit cc454911ac5aec527379c2e51259583071d21ca9 diff --git a/qtscript b/qtscript index 14c24e36..18c09cd0 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 14c24e363af3708b6d212cdad6df8832d7a526d0 +Subproject commit 18c09cd0a3dd8143256fbe22b8e62aea346d17f1 diff --git a/qtsensors b/qtsensors index 39dbe667..b99d3da3 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 39dbe66791799eab672043159df50392beb22a12 +Subproject commit b99d3da32b62e2a4c4d907928a5a73bc441db345 diff --git a/qtspeech b/qtspeech index 2534289d..7fc9c071 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 2534289dc8314123d5accbf0f1e56b63555f3c67 +Subproject commit 7fc9c071e8bf3eea5dd9a944089ed064d4e373a3 diff --git a/qtsvg b/qtsvg index 1a869f4a..44ebf280 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1a869f4a6f3f37a2bb986be27d394a0e630b38e8 +Subproject commit 44ebf2803840555a60969fcca5f8f39eb3348939 diff --git a/qtwebchannel b/qtwebchannel index 9ef5f29c..2ff27bf6 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 9ef5f29cce4baea2d7f98104852e0277f3e51148 +Subproject commit 2ff27bf60e3bda8335adc557abd6486c144cb948 diff --git a/qtwebengine b/qtwebengine index 8483cfa6..fe73e540 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8483cfa6b039feb780995cee2f3b0878b131fa1d +Subproject commit fe73e5405716531e85440772f69ad74943024eee diff --git a/qtwebview b/qtwebview index cfa232c2..8515dd6e 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit cfa232c26b5b68145a305d3a51e83ee03de3a4b9 +Subproject commit 8515dd6e203e596c7dbec5b950b3354a8012dd72 diff --git a/qtwinextras b/qtwinextras index 78f6c358..797a8733 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 78f6c358ac3e6690957f499bfd3845ac082f38e8 +Subproject commit 797a8733bf68c5f7a04cfffbb7d933f4c0f2f81c diff --git a/qtx11extras b/qtx11extras index 1c36cf75..a3570e9b 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 1c36cf756c90c24ea3fc5c402399891222f79d91 +Subproject commit a3570e9bab1abe5c80e00ddc10ae688c654c1427 diff --git a/qtxmlpatterns b/qtxmlpatterns index 73c6356d..f6b06147 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 73c6356de441e0a0e59a4e4a7b59640d5b56e8db +Subproject commit f6b06147b0065b1809c0a081fceec6f524dec2a4 -- cgit v1.2.3 From 33d5c271f60717b94278d50c40b4740f8fe5b719 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 20 Jun 2018 14:35:36 +0200 Subject: Update submodules on '5.11' in qt5 Skip qtbase and qtwayland in this round. Change-Id: Id405a21fda570ab62588f128536ba77cc01fd080 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 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 +- qtvirtualkeyboard | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/qt3d b/qt3d index 6abed231..7b2d0fdb 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6abed231ae3677e25406d63cc1ad279614acdf3d +Subproject commit 7b2d0fdba63c0aca5e37f59706455618787a44eb diff --git a/qtactiveqt b/qtactiveqt index 717cc8fa..0c466312 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 717cc8fa56b1eb39a372d0c5c561aa30dbbbdd47 +Subproject commit 0c46631233f7d9a0c445ee648818db910f68915b diff --git a/qtandroidextras b/qtandroidextras index e4e20562..8ad2c8e6 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit e4e20562b4865914ab9639a9e26cfdf9b6640855 +Subproject commit 8ad2c8e62a71551495d4c0d5dfae148a6009d027 diff --git a/qtcanvas3d b/qtcanvas3d index 7c97faee..43f3a363 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 7c97faee9749f0655462671d599a2817c59c28f5 +Subproject commit 43f3a363133a93e2c6e465d149476a18f3a5d4e5 diff --git a/qtcharts b/qtcharts index ff0281ec..0c0b63fc 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit ff0281ec6a103e2d87fcb3229c682f9c1e456bc5 +Subproject commit 0c0b63fc6c27ac2b4c14dde2a3658c94b6f78ba4 diff --git a/qtconnectivity b/qtconnectivity index 72ead528..c754e16c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 72ead528a7a1102d147e0b511eaf7ddc3416a162 +Subproject commit c754e16ceddaf6826d2a74775df8409b3278d5b8 diff --git a/qtdatavis3d b/qtdatavis3d index 672028cd..4d2d9a85 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 672028cd4db918f9dcf4a583b3874607f35958c4 +Subproject commit 4d2d9a85932e960e39396b375a7842756c8415fe diff --git a/qtdeclarative b/qtdeclarative index 7f3204ea..053e76ab 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7f3204ea7ba7836907b2d3eeefc51912c1c8c54b +Subproject commit 053e76ab80f72eb026894fc05ee83593ea2079fd diff --git a/qtdoc b/qtdoc index d6686a57..cc95eaf6 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d6686a578debb0a235baeb4b626bc931c7695780 +Subproject commit cc95eaf6e3dc887a0f54fe638b67b16715e2cb9a diff --git a/qtgamepad b/qtgamepad index c738dcf0..50565322 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit c738dcf087a10063b76f3d5f2e4b0b1ab9ba4968 +Subproject commit 505653220f9c609cfbedcb7d81f1f30bf6d247e5 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index aa020d45..a67f916c 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit aa020d45c40206fc6ec3fdd4f589fe5d276d2791 +Subproject commit a67f916c317c9d9fa57f222a6dfe140b928935a7 diff --git a/qtimageformats b/qtimageformats index 8a309a90..177c85c5 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 8a309a90a3ec8db92ff2720a8e49acb232a5cfd7 +Subproject commit 177c85c58db23aad28a7445956cab7f062caaa94 diff --git a/qtmacextras b/qtmacextras index dc8ff4eb..a0e7b29d 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit dc8ff4eb7cc81c44a233e71591fbd72389636b2b +Subproject commit a0e7b29d59161479748204e3b3fe8f11903d93f6 diff --git a/qtmultimedia b/qtmultimedia index a5bad98e..2f7b5465 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a5bad98efc41b1f437c837bb858fc744ceaddba2 +Subproject commit 2f7b546540c11a4697ee7bc363c7ac7cc5b053b4 diff --git a/qtnetworkauth b/qtnetworkauth index 84138b2d..1b2c97d2 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 84138b2d18a3afc69997f29d1efcce1b7cc4d1ae +Subproject commit 1b2c97d27ab420a893fbd45e864ad29986aa49e0 diff --git a/qtpurchasing b/qtpurchasing index 167bc3f1..9e1a5ea7 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 167bc3f1dce02292fb1e3a70bc30ea7485061dbb +Subproject commit 9e1a5ea738c1c9ade78bd0dee4a49e767a674fa1 diff --git a/qtquickcontrols b/qtquickcontrols index 191a2fe5..3b71eea2 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 191a2fe59cbaf7603d502fa764b4737f49422010 +Subproject commit 3b71eea2e6e712103452c98756cd6ce53aa4ebca diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 08437d52..6cf6594a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 08437d525a168df9abbda74d5b5ffddfd2841702 +Subproject commit 6cf6594aa7bb6cdb84d0fca9df6c099b14d2affc diff --git a/qtremoteobjects b/qtremoteobjects index 1d462a79..65b33841 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 1d462a792a17ec1c09b632ea6ad0adad15ad4cbe +Subproject commit 65b338416e5846c3d41f0286ad3020f4a5132e45 diff --git a/qtscript b/qtscript index 14c24e36..23abc3bd 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 14c24e363af3708b6d212cdad6df8832d7a526d0 +Subproject commit 23abc3bdab1f471ec515a6d5b71dccc3d075a1fa diff --git a/qtscxml b/qtscxml index 1fa64303..cf06df0f 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 1fa6430308568a90c3cff6e23d7ee58e97e87574 +Subproject commit cf06df0f8e0488be366aab2645fd5470992c8a4e diff --git a/qtsensors b/qtsensors index 39dbe667..b2765e09 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 39dbe66791799eab672043159df50392beb22a12 +Subproject commit b2765e0922699afd654ef77e849148dba41384c0 diff --git a/qtserialbus b/qtserialbus index aaf7f2c9..06149b7b 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit aaf7f2c99e82b4bfed3b1877401e51f3ec4cceae +Subproject commit 06149b7bdf7573b97e76af6d83d5c0f5c777e305 diff --git a/qtserialport b/qtserialport index ae231fde..ca6052a6 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit ae231fde67ee45d992884ea02502e57bcbe6e64d +Subproject commit ca6052a651b63b05a4deb6c85a2e627ab022264a diff --git a/qtspeech b/qtspeech index 2534289d..7bc90ab3 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 2534289dc8314123d5accbf0f1e56b63555f3c67 +Subproject commit 7bc90ab3d8c59bab7503ccd54f123d777c6c7951 diff --git a/qtsvg b/qtsvg index 1a869f4a..234aa6d3 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1a869f4a6f3f37a2bb986be27d394a0e630b38e8 +Subproject commit 234aa6d3bda9b47177224a17b4e37d52bb2c2c55 diff --git a/qttools b/qttools index d4026593..8f3d0a66 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d40265937d6fbd58be4ffd9fe78989506b4089fb +Subproject commit 8f3d0a6653b99c5eb7963b7fc889cb444350a4c2 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 5ed830b8..a4c615c5 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 5ed830b81d76ca96514c3663206286b0a9519741 +Subproject commit a4c615c51afb16b3177ee5517e8373657d2ddfc7 diff --git a/qtwebchannel b/qtwebchannel index 9ef5f29c..ed82d154 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 9ef5f29cce4baea2d7f98104852e0277f3e51148 +Subproject commit ed82d154255b1bde0e44f0be174cee6e90173f86 diff --git a/qtwebengine b/qtwebengine index 231ec324..a66d4cd8 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 231ec324472b3f279bab61d22f3f82cfc0de8b7d +Subproject commit a66d4cd82972996d76edff52d17464c150dec6a6 diff --git a/qtwebsockets b/qtwebsockets index 1d2e34e8..699a7255 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 1d2e34e85da3c20ee4901ed4ff63162a83c9f403 +Subproject commit 699a72558d3b254e2c911b1ea6c2dbf0198d5bee diff --git a/qtwebview b/qtwebview index cfa232c2..1ac5e98a 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit cfa232c26b5b68145a305d3a51e83ee03de3a4b9 +Subproject commit 1ac5e98a02f4467033c1159860b20e4b6a5d45c4 diff --git a/qtwinextras b/qtwinextras index 78f6c358..72d6faa5 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 78f6c358ac3e6690957f499bfd3845ac082f38e8 +Subproject commit 72d6faa5fb31aaba2bf2dea25971f23b34244f24 diff --git a/qtx11extras b/qtx11extras index 1c36cf75..b0fa7026 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 1c36cf756c90c24ea3fc5c402399891222f79d91 +Subproject commit b0fa702623fc8ed600c1c285a3fa5b80d29b5c0c diff --git a/qtxmlpatterns b/qtxmlpatterns index 73c6356d..df2fb4bb 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 73c6356de441e0a0e59a4e4a7b59640d5b56e8db +Subproject commit df2fb4bbe406ffa080f2ada087822cf74aa2bd81 -- cgit v1.2.3 From 7551b132761b1dd567dbd548d8aebdf8f93caf8f Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Wed, 13 Jun 2018 11:35:48 +0200 Subject: Provisioning: Update MQTT test broker Change-Id: Ie4e9ff5c13eb5f882b70e4e948836ae78496dd40 Reviewed-by: Alex Blasche Reviewed-by: Oswald Buddenhagen --- coin/provisioning/common/unix/mqtt_broker.sh | 4 ++-- coin/provisioning/common/windows/mqtt_broker.ps1 | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/common/unix/mqtt_broker.sh b/coin/provisioning/common/unix/mqtt_broker.sh index c64c0fec..0f3e32aa 100644 --- a/coin/provisioning/common/unix/mqtt_broker.sh +++ b/coin/provisioning/common/unix/mqtt_broker.sh @@ -39,10 +39,10 @@ source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -CommitSHA="c342c09dadc7a664d0a8befad1ca031f5a0b0bc0" +CommitSHA="ef4dbc182ddd06247e4b2618d5ad0a57df12ab25" PrimaryUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip" AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip" -SHA1="532fe145096cdd8d679f425cbfd883289150c968" +SHA1="ba2b7d05afe4e13446d40cd4e753dda7f325a587" targetFolder="/opt/paho_broker" appPrefix="paho.mqtt.testing-$CommitSHA" diff --git a/coin/provisioning/common/windows/mqtt_broker.ps1 b/coin/provisioning/common/windows/mqtt_broker.ps1 index a80e23dd..7cb8dd7c 100644 --- a/coin/provisioning/common/windows/mqtt_broker.ps1 +++ b/coin/provisioning/common/windows/mqtt_broker.ps1 @@ -35,9 +35,11 @@ Write-Host "MQTT: Downloading Paho test broker..." $zip = Get-DownloadLocation "pahotest.zip" -$externalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip" -$internalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip" -$sha1 = "532fe145096cdd8d679f425cbfd883289150c968" +$commitSHA = "ef4dbc182ddd06247e4b2618d5ad0a57df12ab25" +$sha1 = "ba2b7d05afe4e13446d40cd4e753dda7f325a587" + +$externalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip" +$internalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip" Download $externalUrl $internalUrl $zip Verify-Checksum $zip $sha1 @@ -46,4 +48,4 @@ Write-Host "MQTT: Installing $zip..." Extract-7Zip $zip C:\Utils Remove-Item -Path $zip -Set-EnvironmentVariable "MQTT_TEST_BROKER_LOCATION" "C:\Utils\paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0\interoperability\startbroker.py" +Set-EnvironmentVariable "MQTT_TEST_BROKER_LOCATION" "C:\Utils\paho.mqtt.testing-$commitSHA\interoperability\startbroker.py" -- cgit v1.2.3 From 92f1fe4e344ffbd393ddcc3c563e144c91c38ce5 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 25 Jun 2018 14:53:28 +0200 Subject: Replace commercial preview license with Qt License Agreement 4.0 Do allow people to build from git using the Qt License Agreement 4.0. The license agreement text is the same as in the installers, except that some Unicode characters got normalized to their ASCII variants, and things have been properly wrapped. This follows qtbase change 60e56f1679d6. Task-number: QTBUG-52222 Change-Id: Id00d026e47be3bfc488419652d9f53d72d56f0d0 Reviewed-by: Lars Knoll --- LICENSE.PREVIEW.COMMERCIAL | 628 --------------------------- LICENSE.QT-LICENSE-AGREEMENT-4.0 | 913 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 913 insertions(+), 628 deletions(-) delete mode 100644 LICENSE.PREVIEW.COMMERCIAL create mode 100644 LICENSE.QT-LICENSE-AGREEMENT-4.0 diff --git a/LICENSE.PREVIEW.COMMERCIAL b/LICENSE.PREVIEW.COMMERCIAL deleted file mode 100644 index 15e61fc1..00000000 --- a/LICENSE.PREVIEW.COMMERCIAL +++ /dev/null @@ -1,628 +0,0 @@ -TECHNOLOGY PREVIEW LICENSE AGREEMENT - -For individuals and/or legal entities resident in the Americas (North -America, Central America and South America), the applicable licensing -terms are specified under the heading "Technology Preview License -Agreement: The Americas". - -For individuals and/or legal entities not resident in The Americas, the -applicable licensing terms are specified under the heading "Technology -Preview License Agreement: Rest of the World". - - -TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas -Agreement version 2.4 - -This Technology Preview License Agreement ("Agreement")is a legal agreement -between Digia USA, Inc. ("Digia"), with its registered office at 2350 -Mission College Blvd., Suite 1020, Santa Clara, California 95054, -U.S.A. and you (either an individual or a legal entity) ("Licensee") for the -Licensed Software (as defined below). - -1. DEFINITIONS - -"Affiliate" of a Party shall mean an entity (i) which is directly or -indirectly controlling such Party; (ii) which is under the same direct -or indirect ownership or control as such Party; or (iii) which is -directly or indirectly owned or controlled by such Party. For these -purposes, an entity shall be treated as being controlled by another if -that other entity has fifty percent (50 %) or more of the votes in such -entity, is able to direct its affairs and/or to control the composition -of its board of directors or equivalent body. - -"Applications" shall mean Licensee's software products created using the -Licensed Software which may include portions of the Licensed Software. - -"Term" shall mean the period of time six (6) months from the later of -(a) the Effective Date; or (b) the date the Licensed Software was -initially delivered to Licensee by Digia. If no specific Effective Date -is set forth in the Agreement, the Effective Date shall be deemed to be -the date the Licensed Software was initially delivered to Licensee. - -"Licensed Software" shall mean the computer software, "online" or -electronic documentation, associated media and printed materials, -including the source code, example programs and the documentation -delivered by Digia to Licensee in conjunction with this Agreement. - -"Party" or "Parties" shall mean Licensee and/or Digia. - - -2. OWNERSHIP - -The Licensed Software is protected by copyright laws and international -copyright treaties, as well as other intellectual property laws and -treaties. The Licensed Software is licensed, not sold. - -If Licensee provides any findings, proposals, suggestions or other -feedback ("Feedback") to Digia regarding the Licensed Software, Digia -shall own all right, title and interest including the intellectual -property rights in and to such Feedback, excluding however any existing -patent rights of Licensee. To the extent Licensee owns or controls any -patents for such Feedback Licensee hereby grants to Digia and its -Affiliates, a worldwide, perpetual, non-transferable, sublicensable, -royalty-free license to (i) use, copy and modify Feedback and to create -derivative works thereof, (ii) to make (and have made), use, import, -sell, offer for sale, lease, dispose, offer for disposal or otherwise -exploit any products or services of Digia containing Feedback, and -(iii) sublicense all the foregoing rights to third party licensees and -customers of Digia and/or its Affiliates. - - -3. VALIDITY OF THE AGREEMENT - -By installing, copying, or otherwise using the Licensed Software, -Licensee agrees to be bound by the terms of this Agreement. If Licensee -does not agree to the terms of this Agreement, Licensee may not install, -copy, or otherwise use the Licensed Software. Upon Licensee's acceptance -of the terms and conditions of this Agreement, Digia grants Licensee the -right to use the Licensed Software in the manner provided below. - - -4. LICENSES - -4.1. Using and Copying - -Digia grants to Licensee a non-exclusive, non-transferable, time-limited -license to use and copy the Licensed Software for sole purpose of -designing, developing and testing Applications, and evaluating and the -Licensed Software during the Term. - -Licensee may install copies of the Licensed Software on an unlimited -number of computers provided that (a) if an individual, only such -individual; or (b) if a legal entity only its employees; use the -Licensed Software for the authorized purposes. - -4.2 No Distribution or Modifications - -Licensee may not disclose, modify, sell, market, commercialise, -distribute, loan, rent, lease, or license the Licensed Software or any -copy of it or use the Licensed Software for any purpose that is not -expressly granted in this Section 4. Licensee may not alter or remove -any details of ownership, copyright, trademark or other property right -connected with the Licensed Software. Licensee may not distribute any -software statically or dynamically linked with the Licensed Software. - -4.3 No Technical Support - -Digia has no obligation to furnish Licensee with any technical support -whatsoever. Any such support is subject to separate agreement between -the Parties. - - -5. PRE-RELEASE CODE -The Licensed Software contains pre-release code that is not at the level -of performance and compatibility of a final, generally available, -product offering. The Licensed Software may not operate correctly and -may be substantially modified prior to the first commercial product -release, if any. Digia is not obligated to make this or any later -version of the Licensed Software commercially available. The License -Software is "Not for Commercial Use" and may only be used for the -purposes described in Section 4. The Licensed Software may not be used -in a live operating environment where it may be relied upon to perform -in the same manner as a commercially released product or with data that -has not been sufficiently backed up. - -6. THIRD PARTY SOFTWARE - -The Licensed Software may provide links to third party libraries or code -(collectively "Third Party Software") to implement various functions. -Third Party Software does not comprise part of the Licensed Software. In -some cases, access to Third Party Software may be included along with -the Licensed Software delivery as a convenience for development and -testing only. Such source code and libraries may be listed in the -".../src/3rdparty" source tree delivered with the Licensed Software or -documented in the Licensed Software where the Third Party Software is -used, as may be amended from time to time, do not comprise the Licensed -Software. Licensee acknowledges (1) that some part of Third Party -Software may require additional licensing of copyright and patents from -the owners of such, and (2) that distribution of any of the Licensed -Software referencing any portion of a Third Party Software may require -appropriate licensing from such third parties. - - -7. LIMITED WARRANTY AND WARRANTY DISCLAIMER - -The Licensed Software is licensed to Licensee "as is". To the maximum -extent permitted by applicable law, Digia on behalf of itself and its -suppliers, disclaims all warranties and conditions, either express or -implied, including, but not limited to, implied warranties of -merchantability, fitness for a particular purpose, title and -non-infringement with regard to the Licensed Software. - - -8. LIMITATION OF LIABILITY - -If, Digia's warranty disclaimer notwithstanding, Digia is held liable to -Licensee, whether in contract, tort or any other legal theory, based on -the Licensed Software, Digia's entire liability to Licensee and -Licensee's exclusive remedy shall be, at Digia's option, either (A) -return of the price Licensee paid for the Licensed Software, or (B) -repair or replacement of the Licensed Software, provided Licensee -returns to Digia all copies of the Licensed Software as originally -delivered to Licensee. Digia shall not under any circumstances be liable -to Licensee based on failure of the Licensed Software if the failure -resulted from accident, abuse or misapplication, nor shall Digia under -any circumstances be liable for special damages, punitive or exemplary -damages, damages for loss of profits or interruption of business or for -loss or corruption of data. Any award of damages from Digia to Licensee -shall not exceed the total amount Licensee has paid to Digia in -connection with this Agreement. - - -9. CONFIDENTIALITY - -Each party acknowledges that during the Term of this Agreement it shall -have access to information about the other party's business, business -methods, business plans, customers, business relations, technology, and -other information, including the terms of this Agreement, that is -confidential and of great value to the other party, and the value of -which would be significantly reduced if disclosed to third parties (the -"Confidential Information"). Accordingly, when a party (the "Receiving -Party") receives Confidential Information from another party (the -"Disclosing Party"), the Receiving Party shall, and shall obligate its -employees and agents and employees and agents of its Affiliates to: (i) -maintain the Confidential Information in strict confidence; (ii) not -disclose the Confidential Information to a third party without the -Disclosing Party's prior written approval; and (iii) not, directly or -indirectly, use the Confidential Information for any purpose other than -for exercising its rights and fulfilling its responsibilities pursuant -to this Agreement. Each party shall take reasonable measures to protect -the Confidential Information of the other party, which measures shall -not be less than the measures taken by such party to protect its own -confidential and proprietary information. - -"Confidential Information" shall not include information that (a) is or -becomes generally known to the public through no act or omission of the -Receiving Party; (b) was in the Receiving Party's lawful possession -prior to the disclosure hereunder and was not subject to limitations on -disclosure or use; (c) is developed by the Receiving Party without -access to the Confidential Information of the Disclosing Party or by -persons who have not had access to the Confidential Information of the -Disclosing Party as proven by the written records of the Receiving -Party; (d) is lawfully disclosed to the Receiving Party without -restrictions, by a third party not under an obligation of -confidentiality; or (e) the Receiving Party is legally compelled to -disclose the information, in which case the Receiving Party shall assert -the privileged and confidential nature of the information and cooperate -fully with the Disclosing Party to protect against and prevent -disclosure of any Confidential Information and to limit the scope of -disclosure and the dissemination of disclosed Confidential Information -by all legally available means. - -The obligations of the Receiving Party under this Section shall continue -during the Initial Term and for a period of five (5) years after -expiration or termination of this Agreement. To the extent that the -terms of the Non-Disclosure Agreement between Digia and Licensee -conflict with the terms of this Section 9, this Section 9 shall be -controlling over the terms of the Non-Disclosure Agreement. - - -10. GENERAL PROVISIONS - -10.1 No Assignment - -Licensee shall not be entitled to assign or transfer all or any of its -rights, benefits and obligations under this Agreement without the prior -written consent of Digia, which shall not be unreasonably withheld. - -10.2 Termination - -Digia may terminate the Agreement at any time immediately upon written -notice by Digia to Licensee if Licensee breaches this Agreement. - -Upon termination of this Agreement, Licensee shall return to Digia all -copies of Licensed Software that were supplied by Digia. All other -copies of Licensed Software in the possession or control of Licensee -must be erased or destroyed. An officer of Licensee must promptly -deliver to Digia a written confirmation that this has occurred. - -10.3 Surviving Sections - -Any terms and conditions that by their nature or otherwise reasonably -should survive a cancellation or termination of this Agreement shall -also be deemed to survive. Such terms and conditions include, but are -not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3, 10.4, -10.5, 10.6, 10.7, and 10.8 of this Agreement. - -10.4 Entire Agreement - -This Agreement constitutes the complete agreement between the parties -and supersedes all prior or contemporaneous discussions, -representations, and proposals, written or oral, with respect to the -subject matters discussed herein, with the exception of the -non-disclosure agreement executed by the parties in connection with this -Agreement ("Non-Disclosure Agreement"), if any, shall be subject to -Section 9. No modification of this Agreement shall be effective unless -contained in a writing executed by an authorized representative of each -party. No term or condition contained in Licensee's purchase order shall -apply unless expressly accepted by Digia in writing. If any provision of -the Agreement is found void or unenforceable, the remainder shall remain -valid and enforceable according to its terms. If any remedy provided is -determined to have failed for its essential purpose, all limitations of -liability and exclusions of damages set forth in this Agreement shall -remain in effect. - -10.5 Export Control - -Licensee acknowledges that the Licensed Software may be subject to -export control restrictions of various countries. Licensee shall fully -comply with all applicable export license restrictions and requirements -as well as with all laws and regulations relating to the importation of -the Licensed Software and shall procure all necessary governmental -authorizations, including without limitation, all necessary licenses, -approvals, permissions or consents, where necessary for the -re-exportation of the Licensed Software., - -10.6 Governing Law and Legal Venue - -This Agreement shall be governed by and construed in accordance with the -federal laws of the United States of America and the internal laws of -the State of New York without given effect to any choice of law rule -that would result in the application of the laws of any other -jurisdiction. The United Nations Convention on Contracts for the -International Sale of Goods (CISG) shall not apply. Each Party (a) -hereby irrevocably submits itself to and consents to the jurisdiction of -the United States District Court for the Southern District of New York -(or if such court lacks jurisdiction, the state courts of the State of -New York) for the purposes of any action, claim, suit or proceeding -between the Parties in connection with any controversy, claim, or -dispute arising out of or relating to this Agreement; and (b) hereby -waives, and agrees not to assert by way of motion, as a defense or -otherwise, in any such action, claim, suit or proceeding, any claim that -is not personally subject to the jurisdiction of such court(s), that the -action, claim, suit or proceeding is brought in an inconvenient forum or -that the venue of the action, claim, suit or proceeding is improper. -Notwithstanding the foregoing, nothing in this Section 9.6 is intended -to, or shall be deemed to, constitute a submission or consent to, or -selection of, jurisdiction, forum or venue for any action for patent -infringement, whether or not such action relates to this Agreement. - -10.7 No Implied License - -There are no implied licenses or other implied rights granted under this -Agreement, and all rights, save for those expressly granted hereunder, -shall remain with Digia and its licensors. In addition, no licenses or -immunities are granted to the combination of the Licensed Software with -any other software or hardware not delivered by Digia under this -Agreement. - -10.8 Government End Users - -A "U.S. Government End User" shall mean any agency or entity of the -government of the United States. The following shall apply if Licensee -is a U.S. Government End User. The Licensed Software is a "commercial -item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), -consisting of "commercial computer software" and "commercial computer -software documentation," as such terms are used in 48 C.F.R. 12.212 -(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 -through 227.7202-4 (June 1995), all U.S. Government End Users acquire -the Licensed Software with only those rights set forth herein. The -Licensed Software (including related documentation) is provided to U.S. -Government End Users: (a) only as a commercial end item; and (b) only -pursuant to this Agreement. - - - - - -TECHNOLOGY PREVIEW LICENSE AGREEMENT: Rest of the World -Agreement version 2.4 - -This Technology Preview License Agreement ("Agreement") is a legal -agreement between Digia Finland Ltd ("Digia"), with its registered office at -Valimotie 21,FI-00380 Helsinki, Finland and you (either an individual or a -legal entity) ("Licensee") for the Licensed Software. - -1. DEFINITIONS - -"Affiliate" of a Party shall mean an entity (i) which is directly or -indirectly controlling such Party; (ii) which is under the same direct -or indirect ownership or control as such Party; or (iii) which is -directly or indirectly owned or controlled by such Party. For these -purposes, an entity shall be treated as being controlled by another if -that other entity has fifty percent (50 %) or more of the votes in such -entity, is able to direct its affairs and/or to control the composition -of its board of directors or equivalent body. - -"Applications" shall mean Licensee's software products created using the -Licensed Software which may include portions of the Licensed Software. - -"Term" shall mean the period of time six (6) months from the later of -(a) the Effective Date; or (b) the date the Licensed Software was -initially delivered to Licensee by Digia. If no specific Effective Date -is set forth in the Agreement, the Effective Date shall be deemed to be -the date the Licensed Software was initially delivered to Licensee. - -"Licensed Software" shall mean the computer software, "online" or -electronic documentation, associated media and printed materials, -including the source code, example programs and the documentation -delivered by Digia to Licensee in conjunction with this Agreement. - -"Party" or "Parties" shall mean Licensee and/or Digia. - - -2. OWNERSHIP - -The Licensed Software is protected by copyright laws and international -copyright treaties, as well as other intellectual property laws and -treaties. The Licensed Software is licensed, not sold. - -If Licensee provides any findings, proposals, suggestions or other -feedback ("Feedback") to Digia regarding the Licensed Software, Digia -shall own all right, title and interest including the intellectual -property rights in and to such Feedback, excluding however any existing -patent rights of Licensee. To the extent Licensee owns or controls any -patents for such Feedback Licensee hereby grants to Digia and its -Affiliates, a worldwide, perpetual, non-transferable, sublicensable, -royalty-free license to (i) use, copy and modify Feedback and to create -derivative works thereof, (ii) to make (and have made), use, import, -sell, offer for sale, lease, dispose, offer for disposal or otherwise -exploit any products or services of Digia containing Feedback, and -(iii) sublicense all the foregoing rights to third party licensees and -customers of Digia and/or its Affiliates. - -3. VALIDITY OF THE AGREEMENT - -By installing, copying, or otherwise using the Licensed Software, -Licensee agrees to be bound by the terms of this Agreement. If Licensee -does not agree to the terms of this Agreement, Licensee may not install, -copy, or otherwise use the Licensed Software. Upon Licensee's acceptance -of the terms and conditions of this Agreement, Digia grants Licensee the -right to use the Licensed Software in the manner provided below. - - -4. LICENSES - -4.1. Using and Copying - -Digia grants to Licensee a non-exclusive, non-transferable, time-limited -license to use and copy the Licensed Software for sole purpose of -designing, developing and testing Applications, and evaluating and the -Licensed Software during the Term. - -Licensee may install copies of the Licensed Software on an unlimited -number of computers provided that (a) if an individual, only such -individual; or (b) if a legal entity only its employees; use the -Licensed Software for the authorized purposes. - -4.2 No Distribution or Modifications - -Licensee may not disclose, modify, sell, market, commercialise, -distribute, loan, rent, lease, or license the Licensed Software or any -copy of it or use the Licensed Software for any purpose that is not -expressly granted in this Section 4. Licensee may not alter or remove -any details of ownership, copyright, trademark or other property right -connected with the Licensed Software. Licensee may not distribute any -software statically or dynamically linked with the Licensed Software. - -4.3 No Technical Support - -Digia has no obligation to furnish Licensee with any technical support -whatsoever. Any such support is subject to separate agreement between -the Parties. - - -5. PRE-RELEASE CODE - -The Licensed Software contains pre-release code that is not at the level -of performance and compatibility of a final, generally available, -product offering. The Licensed Software may not operate correctly and -may be substantially modified prior to the first commercial product -release, if any. Digia is not obligated to make this or any later -version of the Licensed Software commercially available. The License -Software is "Not for Commercial Use" and may only be used for the -purposes described in Section 4. The Licensed Software may not be used -in a live operating environment where it may be relied upon to perform -in the same manner as a commercially released product or with data that -has not been sufficiently backed up. - -6. THIRD PARTY SOFTWARE - -The Licensed Software may provide links to third party libraries or code -(collectively "Third Party Software") to implement various functions. -Third Party Software does not comprise part of the Licensed Software. In -some cases, access to Third Party Software may be included along with -the Licensed Software delivery as a convenience for development and -testing only. Such source code and libraries may be listed in the -".../src/3rdparty" source tree delivered with the Licensed Software or -documented in the Licensed Software where the Third Party Software is -used, as may be amended from time to time, do not comprise the Licensed -Software. Licensee acknowledges (1) that some part of Third Party -Software may require additional licensing of copyright and patents from -the owners of such, and (2) that distribution of any of the Licensed -Software referencing any portion of a Third Party Software may require -appropriate licensing from such third parties. - - -7. LIMITED WARRANTY AND WARRANTY DISCLAIMER - -The Licensed Software is licensed to Licensee "as is". To the maximum -extent permitted by applicable law, Digia on behalf of itself and its -suppliers, disclaims all warranties and conditions, either express or -implied, including, but not limited to, implied warranties of -merchantability, fitness for a particular purpose, title and -non-infringement with regard to the Licensed Software. - - -8. LIMITATION OF LIABILITY - -If, Digia's warranty disclaimer notwithstanding, Digia is held liable to -Licensee, whether in contract, tort or any other legal theory, based on -the Licensed Software, Digia's entire liability to Licensee and -Licensee's exclusive remedy shall be, at Digia's option, either (A) -return of the price Licensee paid for the Licensed Software, or (B) -repair or replacement of the Licensed Software, provided Licensee -returns to Digia all copies of the Licensed Software as originally -delivered to Licensee. Digia shall not under any circumstances be liable -to Licensee based on failure of the Licensed Software if the failure -resulted from accident, abuse or misapplication, nor shall Digia under -any circumstances be liable for special damages, punitive or exemplary -damages, damages for loss of profits or interruption of business or for -loss or corruption of data. Any award of damages from Digia to Licensee -shall not exceed the total amount Licensee has paid to Digia in -connection with this Agreement. - - -9. CONFIDENTIALITY - -Each party acknowledges that during the Term of this Agreement it shall -have access to information about the other party's business, business -methods, business plans, customers, business relations, technology, and -other information, including the terms of this Agreement, that is -confidential and of great value to the other party, and the value of -which would be significantly reduced if disclosed to third parties (the -"Confidential Information"). Accordingly, when a party (the "Receiving -Party") receives Confidential Information from another party (the -"Disclosing Party"), the Receiving Party shall, and shall obligate its -employees and agents and employees and agents of its Affiliates to: (i) -maintain the Confidential Information in strict confidence; (ii) not -disclose the Confidential Information to a third party without the -Disclosing Party's prior written approval; and (iii) not, directly or -indirectly, use the Confidential Information for any purpose other than -for exercising its rights and fulfilling its responsibilities pursuant -to this Agreement. Each party shall take reasonable measures to protect -the Confidential Information of the other party, which measures shall -not be less than the measures taken by such party to protect its own -confidential and proprietary information. - -"Confidential Information" shall not include information that (a) is or -becomes generally known to the public through no act or omission of the -Receiving Party; (b) was in the Receiving Party's lawful possession -prior to the disclosure hereunder and was not subject to limitations on -disclosure or use; (c) is developed by the Receiving Party without -access to the Confidential Information of the Disclosing Party or by -persons who have not had access to the Confidential Information of the -Disclosing Party as proven by the written records of the Receiving -Party; (d) is lawfully disclosed to the Receiving Party without -restrictions, by a third party not under an obligation of -confidentiality; or (e) the Receiving Party is legally compelled to -disclose the information, in which case the Receiving Party shall assert -the privileged and confidential nature of the information and cooperate -fully with the Disclosing Party to protect against and prevent -disclosure of any Confidential Information and to limit the scope of -disclosure and the dissemination of disclosed Confidential Information -by all legally available means. - -The obligations of the Receiving Party under this Section shall continue -during the Initial Term and for a period of five (5) years after -expiration or termination of this Agreement. To the extent that the -terms of the Non-Disclosure Agreement between Digia and Licensee -conflict with the terms of this Section 9, this Section 9 shall be -controlling over the terms of the Non-Disclosure Agreement. - - -10. GENERAL PROVISIONS - -10.1 No Assignment - -Licensee shall not be entitled to assign or transfer all or any of its -rights, benefits and obligations under this Agreement without the prior -written consent of Digia, which shall not be unreasonably withheld. - -10.2 Termination - -Digia may terminate the Agreement at any time immediately upon written -notice by Digia to Licensee if Licensee breaches this Agreement. - -Upon termination of this Agreement, Licensee shall return to Digia all -copies of Licensed Software that were supplied by Digia. All other -copies of Licensed Software in the possession or control of Licensee -must be erased or destroyed. An officer of Licensee must promptly -deliver to Digia a written confirmation that this has occurred. - -10.3 Surviving Sections - -Any terms and conditions that by their nature or otherwise reasonably -should survive a cancellation or termination of this Agreement shall -also be deemed to survive. Such terms and conditions include, but are -not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3, 10.4, -10.5, 10.6, 10.7, and 10.8 of this Agreement. - -10.4 Entire Agreement - -This Agreement constitutes the complete agreement between the parties -and supersedes all prior or contemporaneous discussions, -representations, and proposals, written or oral, with respect to the -subject matters discussed herein, with the exception of the -non-disclosure agreement executed by the parties in connection with this -Agreement ("Non-Disclosure Agreement"), if any, shall be subject to -Section 9. No modification of this Agreement shall be effective unless -contained in a writing executed by an authorized representative of each -party. No term or condition contained in Licensee's purchase order shall -apply unless expressly accepted by Digia in writing. If any provision of -the Agreement is found void or unenforceable, the remainder shall remain -valid and enforceable according to its terms. If any remedy provided is -determined to have failed for its essential purpose, all limitations of -liability and exclusions of damages set forth in this Agreement shall -remain in effect. - -10.5 Export Control - -Licensee acknowledges that the Licensed Software may be subject to -export control restrictions of various countries. Licensee shall fully -comply with all applicable export license restrictions and requirements -as well as with all laws and regulations relating to the importation of -the Licensed Software and shall procure all necessary governmental -authorizations, including without limitation, all necessary licenses, -approvals, permissions or consents, where necessary for the -re-exportation of the Licensed Software., - -10.6 Governing Law and Legal Venue - -This Agreement shall be construed and interpreted in accordance with the -laws of Finland, excluding its choice of law provisions. Any disputes -arising out of or relating to this Agreement shall be resolved in -arbitration under the Rules of Arbitration of the Chamber of Commerce of -Helsinki, Finland. The arbitration tribunal shall consist of one (1), or -if either Party so requires, of three (3), arbitrators. The award shall -be final and binding and enforceable in any court of competent -jurisdiction. The arbitration shall be held in Helsinki, Finland and the -process shall be conducted in the English language. - -10.7 No Implied License - -There are no implied licenses or other implied rights granted under this -Agreement, and all rights, save for those expressly granted hereunder, -shall remain with Digia and its licensors. In addition, no licenses or -immunities are granted to the combination of the Licensed Software with -any other software or hardware not delivered by Digia under this -Agreement. - -10.8 Government End Users - -A "U.S. Government End User" shall mean any agency or entity of the -government of the United States. The following shall apply if Licensee -is a U.S. Government End User. The Licensed Software is a "commercial -item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), -consisting of "commercial computer software" and "commercial computer -software documentation," as such terms are used in 48 C.F.R. 12.212 -(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 -through 227.7202-4 (June 1995), all U.S. Government End Users acquire -the Licensed Software with only those rights set forth herein. The -Licensed Software (including related documentation) is provided to U.S. -Government End Users: (a) only as a commercial end item; and (b) only -pursuant to this Agreement. - - - - diff --git a/LICENSE.QT-LICENSE-AGREEMENT-4.0 b/LICENSE.QT-LICENSE-AGREEMENT-4.0 new file mode 100644 index 00000000..74bd6bb4 --- /dev/null +++ b/LICENSE.QT-LICENSE-AGREEMENT-4.0 @@ -0,0 +1,913 @@ +QT LICENSE AGREEMENT +Agreement version 4.0 + +This License Agreement ("Agreement") is a legal agreement between The Qt +Company (as defined below) and the Licensee (as defined below) for the license +of Licensed Software (as defined below). Capitalized terms used herein are +defined in Section 1. + +WHEREAS: + +(A). Licensee wishes to use the Licensed Software for the purpose of developing +and distributing Applications and/or Devices; and + +(B). The Qt Company is willing to grant the Licensee a right to use Licensed +Software for such purpose pursuant to term and conditions of this Agreement. + +NOW, THEREFORE, THE PARTIES HEREBY AGREE AS FOLLOWS: + +1. DEFINITIONS + +"Affiliate" of a Party shall mean an entity (i) which is directly or indirectly +controlling such Party; (ii) which is under the same direct or indirect +ownership or control as such Party; or (iii) which is directly or indirectly +owned or controlled by such Party. For these purposes, an entity shall be +treated as being controlled by another if that other entity has fifty percent +(50 %) or more of the votes in such entity, is able to direct its affairs +and/or to control the composition of its board of directors or equivalent body. + +"Applications" shall mean Licensee's software products created using the +Licensed Software, which may include the Redistributables, or part +thereof. + +"Contractor(s)" shall mean third party consultants, distributors and +contractors performing services to a Party under applicable contractual +arrangement. + +"Customer(s)" shall mean Licensee's end users to whom Licensee, directly or +indirectly, distributes copies of the Redistributables. + +"Deployment Platforms" shall mean operating systems specified in the License +Certificate, in which the Redistributables can be distributed pursuant to the +terms and conditions of this Agreement. + +"Designated User(s)" shall mean the employee(s) of Licensee or Licensee's +Affiliates acting within the scope of their employment or Licensee's +Contractors acting within the scope of their services for Licensee and on +behalf of Licensee. Designated Users shall be named in the License Certificate. + +"Development License" shall mean the license needed by the Licensee for each +Designated User to use the Licensed Software under the license grant described +in Section 3.1 of this Agreement. + +"Development Platforms" shall mean those operating systems specified in the +License Certificate, in which the Licensed Software can be used under the +Development License, but not distributed in any form or used for any other +purpose. + +"Devices" shall mean hardware devices or products that 1) are manufactured +and/or distributed by the Licensee or its Affiliates or Contractors, and +(2)(i) incorporate or integrate the Redistributables or parts thereof; or (ii) +do not incorporate or integrate the Redistributables at the time of +distribution, but where, when used by a Customer, the main user interface or +substantial functionality of such device is provided by Application(s) or +otherwise depends on the Licensed Software. + +"Distribution License(s)" shall mean the license required for distribution of +Redistributables in connection with Devices pursuant to license grant described +in Section 3.3 of this Agreement. + +"Distribution License Packs" shall mean set of prepaid Distribution Licenses +for distribution of Redistributables, as defined in The Qt Company's standard +price list, quote, Purchase Order confirmation or in an appendix hereto, +as the case may be. + +"Intellectual Property Rights" shall mean patents (including utility models), +design patents, and designs (whether or not capable of registration), chip +topography rights and other like protection, copyrights, trademarks, service +marks, trade names, logos or other words or symbols and any other form of +statutory protection of any kind and applications for any of the foregoing as +well as any trade secrets. + +"License Certificate" shall mean a certificate generated by The Qt Company for +each Designated User respectively upon them downloading the licensed Software. +License Certificate will be available under respective Designated User's Qt +Account at account.qt.io and it will specify the Designated User, the +Development Platforms, Deployment Platforms and the License Term. The terms of +the License Certificate are considered part of this Agreement and shall be +updated from time to time to reflect any agreed changes to the foregoing terms +relating to Designated User's rights to the Licensed Software. + +"License Fee" shall mean the fee charged to the Licensee for rights granted +under the terms of this Agreement. + +"License Term" shall mean the agreed validity period of the Development +License of the respective Designated User, during which time the +Designated User is entitled to use the Licensed Software, as set forth in the +respective License Certificate. + +"Licensed Software" shall mean all versions of the + +(i) Qt Toolkit (including Qt Essentials, Qt Add-Ons and Value-Add modules) as +described in http://doc.qt.io/qt-5/qtmodules.html, + +(ii) Qt Creator (including Creator IDE tool) as described in +http://doc.qt.io/qtcreator/index.html, + +(iii) Qt 3D Studio as described in http://doc.qt.io/qt3dstudio/index.html, and + +as well as corresponding online or electronic documentation, associated media +and printed materials, including the source code, example programs and the +documentation, licensed to the Licensee under this Agreement. Licensed Software +does not include Third Party Software (as defined in Section 4), Open Source +Qt, or other software products of The Qt Company (for example Qt Safe Renderer +and Qt for Automation), unless such other software products of The Qt Company +are separately agreed in writing to be included in scope of the Licensed +Software. + +"Licensee" shall mean the individual or legal entity that is party to this +Agreement, as identified on the signature page hereof. + +"Licensee's Records" shall mean books and records that are likely to contain +information bearing on Licensee's compliance with this Agreement or the +payments due to The Qt Company under this Agreement, including, but not limited +to: assembly logs, sales records and distribution records. + +"Modified Software" shall have the meaning as set forth in Section 2.3. + +"Online Services" shall mean any services or access to systems made available +by The Qt Company to the Licensee over the Internet relating to the Licensed +Software or for the purpose of use by the Licensee of the Licensed Software or +Support. Use of any such Online Services is discretionary for the Licensee and +some of them may be subject to additional fees. + +"Open Source Qt" shall mean the non-commercial Qt computer software products, +licensed under the terms of the GNU Lesser General Public License, version +2.1 or later ("LGPL") or the GNU General Public License, version 2.0 or later +("GPL"). For clarity, Open Source Qt shall not be provided nor governed under +this Agreement. + +"Party" or "Parties" shall mean Licensee and/or The Qt Company. + +"Redistributables" shall mean the portions of the Licensed Software set forth +in Appendix 1, Section 1 that may be distributed pursuant to the terms of this +Agreement in object code form only, including any relevant documentation. +Where relevant, any reference to Licensed Software in this Agreement shall +include and refer also to Redistributables. + +"Renewal Term" shall mean an extension of previous License Term as agreed +between the Parties. + +"Submitted Modified Software" shall have the meaning as set forth in +Section 2.3. + +"Support" shall mean standard developer support that is provided by The Qt +Company to assist Designated Users in using the Licensed Software in +accordance with The Qt Company's standard support terms and as further +defined in Section 8 hereunder. + +"Taxes" shall have the meaning set forth in Section 10.5. + +"Term" shall have the meaning set forth in Section 12. + +"The Qt Company" shall mean: + +(i) in the event Licensee is an individual residing in the United States or a +legal entity incorporated in the United States or having its headquarters in +the United States, The Qt Company Inc., a Delaware corporation with its office +at 2350 Mission College Blvd., Suite 1020, Santa Clara, CA 95054, USA.; or + +(ii) in the event the Licensee is an individual residing outside of the United +States or a legal entity incorporated outside of the United States or having +its registered office outside of the United States, The Qt Company Ltd., a +Finnish company with its registered office at Bertel Jungin aukio D3A, 02600 +Espoo, Finland. + +"Third Party Software " shall have the meaning set forth in Section 4. + +"Updates" shall mean a release or version of the Licensed Software containing +bug fixes, error corrections and other changes that are generally made +available to users of the Licensed Software that have contracted for Support. +Updates are generally depicted as a change to the digits following the decimal +in the Licensed Software version number. The Qt Company shall make Updates +available to the Licensee under the Support. Updates shall be considered as +part of the Licensed Software hereunder. + +"Upgrades" shall mean a release or version of the Licensed Software containing +enhancements and new features and are generally depicted as a change to the +first digit of the Licensed Software version number. In the event Upgrades are +provided to the Licensee under this Agreement, they shall be considered as +part of the Licensed Software hereunder. + +2. OWNERSHIP + +2.1 Ownership of The Qt Company + +The Licensed Software is protected by copyright laws and international +copyright treaties, as well as other intellectual property laws and treaties. +The Licensed Software is licensed, not sold. + +All The Qt Company's Intellectual Property Rights are and shall remain the +exclusive property of The Qt Company or its licensors respectively. + +2.2 Ownership of Licensee + +All the Licensee's Intellectual Property Rights are and shall remain the +exclusive property of the Licensee or its licensors respectively. + +All Intellectual Property Rights to the Modified Software, Applications and +Devices shall remain with the Licensee and no rights thereto shall be granted +by the Licensee to The Qt Company under this Agreement (except as set forth in +Section 2.3 below). + +2.3 Modified Software + +Licensee may create bug-fixes, error corrections, patches or modifications to +the Licensed Software ("Modified Software"). Such Modified Software may break +the source or binary compatibility with the Licensed Software (including +without limitation through changing the application programming interfaces +("API") or by adding, changing or deleting any variable, method, or class +signature in the Licensed Software and/or any inter-process protocols, services +or standards in the Licensed Software libraries). To the extent that Licensee's +Modified Software so breaks source or binary compatibility with the Licensed +Software, Licensee acknowledges that The Qt Company's ability to provide +Support may be prevented or limited and Licensee's ability to make use of +Updates may be restricted. + +Licensee may, at its sole and absolute discretion, choose to submit Modified +Software to The Qt Company ("Submitted Modified Software") in connection with +Licensee's Support request, service request or otherwise. In the event Licensee +does so, then, Licensee hereby grants The Qt Company a sublicensable, +assignable, irrevocable, perpetual, worldwide, non-exclusive, royalty-free and +fully paid-up license, under all of Licensee's Intellectual Property Rights, to +reproduce, adapt, translate, modify, and prepare derivative works of, publicly +display, publicly perform, sublicense, make available and distribute such +Submitted Modified Software as The Qt Company sees fit at its free and absolute +discretion. + +3. LICENSES GRANTED + +3.1 Development with Licensed Software + +Subject to the terms of this Agreement, The Qt Company grants to Licensee a +personal, worldwide, non-exclusive, non-transferable license, valid for the +License Term, to use, modify and copy the Licensed Software by Designated Users +on the Development Platforms for the sole purposes of designing, developing, +demonstrating and testing Application(s) and/or Devices, and to provide thereto +related support and other related services to end-user Customers. + +Licensee may install copies of the Licensed Software on an unlimited number of +computers provided that (i) only the Designated Users may use the Licensed +Software, and (ii) all Designated Users must have a valid Development License +to use Licensed Software. + +Licensee may at any time designate another Designated User to replace a then- +current Designated User by notifying The Qt Company in writing, provided that +any Designated User may be replaced only once during any six-month period. + +Upon expiry of the initially agreed License Term, the respective License Terms +shall be automatically extended to one or more Renewal Term(s), unless and +until either Party notifies the other Party in writing that it does not wish to +continue the License Term, such notification to be provided to the other Party +no less than ninety (90) days before expiry of the respective License Term. +Unless otherwise agreed between the Parties, Renewal Term shall be of equal +length with the initial Term. + +Any such Renewal Term shall be subject to License Fees agreed between the +Parties or, if no advance agreement exists, subject to The Qt Company's +standard pricing applicable at the commencement date of any such Renewal Term. + +3.2 Distribution of Applications + +Subject to the terms of this Agreement, The Qt Company grants to Licensee a +personal, worldwide, non-exclusive, non-transferable, revocable (for cause +pursuant to this Agreement) right and license, valid for the Term, to + +(i) distribute, by itself or through its Contractors, Redistributables as +installed, incorporated or integrated into Applications for execution on the +Deployment Platforms, and + +(ii) grant sublicenses to Redistributables, as distributed hereunder, for +Customers solely for Customer's internal use and to the extent necessary in +order for the Customers to use the Applications for their respective intended +purposes. + +Right to distribute the Redistributables as part of an Application as provided +herein is not royalty-bearing but is conditional upon the Licensee having paid +the agreed Development Licenses from The Qt Company before distributing any +Redistributables to Customers. + +3.3 Distribution of Devices + +Subject to the terms of this Agreement, The Qt Company grants to Licensee a +personal, worldwide, non-exclusive, non-transferable, revocable (for cause +pursuant to this Agreement) right and license, valid for the Term, to + +(i) distribute, by itself or through one or more tiers of Contractors, +Redistributables as installed, incorporated or integrated, or intended to be +installed, incorporated or integrated into Devices for execution on the +Deployment Platforms, and + +(ii) grant sublicenses to Redistributables, as distributed hereunder, for +Customers solely for Customer's internal use and to the extent necessary in +order for the Customers to use the Devices for their respective intended +purposes. + +Right to distribute the Redistributables with Devices as provided herein is +conditional upon the Licensee having purchased and paid the appropriate amount +of Development and Distribution Licenses from The Qt Company before +distributing any Redistributables to Customers. + +3.4 Further Requirements + +The licenses granted above in this Section 3 by The Qt Company to Licensee are +conditional and subject to Licensee's compliance with the following terms: + +(i) Licensee shall not remove or alter any copyright, trademark or other +proprietary rights notice contained in any portion of the Licensed Software; + +(ii) Applications must add primary and substantial functionality to the +Licensed Software; + +(iii) Applications may not pass on functionality which in any way makes it +possible for others to create software with the Licensed Software; provided +however that Licensee may use the Licensed Software's scripting and QML ("Qt +Quick") functionality solely in order to enable scripting, themes and styles +that augment the functionality and appearance of the Application(s) without +adding primary and substantial functionality to the Application(s); + +(iv) Applications must not compete with the Licensed Software; + +(v) Licensee shall not use The Qt Company's or any of its suppliers' names, +logos, or trademarks to market Applications, except that Licensee may use +"Built with Qt" logo to indicate that Application(s) was developed using the +Licensed Software; + +(vi) Licensee shall not distribute, sublicense or disclose source code of +Licensed Software to any third party (provided however that Licensee may +appoint employee(s) of Contractors as Designated Users to use Licensed +Software pursuant to this Agreement). Such right may be available for the +Licensee subject to a separate software development kit ("SDK") license +agreement to be concluded with The Qt Company; + +(vii) Licensee shall not grant the Customers a right to (i) make copies of the +Redistributables except when and to the extent required to use the Applications +and/or Devices for their intended purpose, (ii) modify the Redistributables or +create derivative works thereof, (iii) decompile, disassemble or otherwise +reverse engineer Redistributables, or (iv) redistribute any copy or portion of +the Redistributables to any third party, except as part of the onward sale of +the Device on which the Redistributables are installed; + +(viii) Licensee shall not and shall cause that its Affiliates or Contractors +shall not a) in any way combine, incorporate or integrate Licensed Software +with, or use Licensed Software for creation of, any software created with or +incorporating Open Source Qt, or b) incorporate or integrate Applications +into a hardware device or product other than a Device, unless Licensee has +received an advance written permission from The Qt Company to do so. Absent +such written permission, any and all distribution by the Licensee during the +Term of a hardware device or product a) which incorporate or integrate any +part of Licensed Software or Open Source Qt; or b) where the main user +interface or substantial functionality is provided by software build with +Licensed Software or Open Source Qt or otherwise depends on the Licensed +Software or Open Source Qt, shall be considered as a Device distribution under +this Agreement and dependent on compliance thereof (including but not limited +to obligation to pay applicable License Fees for such distribution); + +(ix) Licensee shall cause all of its Affiliates and Contractors entitled to +make use of the licenses granted under this Agreement, to be contractually +bound to comply with the relevant terms of this Agreement and not to use the +Licensed Software beyond the terms hereof and for any purposes other than +operating within the scope of their services for Licensee. Licensee shall be +responsible for any and all actions and omissions of its Affiliates and +Contractors relating to the Licensed Software and use thereof (including but +not limited to payment of all applicable License Fees); + +(x) Except when and to the extent explicitly provided in this Section 3, +Licensee shall not transfer, publish, disclose, display or otherwise make +available the Licensed Software; + +; and + +(xi) Licensee shall not attempt or enlist a third party to conduct or attempt +to conduct any of the above. + +Above terms shall not be applicable if and to the extent they conflict with any +mandatory provisions of any applicable laws. + +Any use of Licensed Software beyond the provisions of this Agreement is +strictly prohibited and requires an additional license from The Qt Company. + +4. THIRD PARTY SOFTWARE + +The Licensed Software may provide links to third party libraries or code +(collectively "Third Party Software") to implement various functions. Third +Party Software does not comprise part of the Licensed Software. In some cases, +access to Third Party Software may be included in the Licensed Software. Such +Third Party Software will be listed in the ".../src/3rdparty" source tree +delivered with the Licensed Software or documented in the Licensed Software, as +such may be amended from time to time. Licensee acknowledges that use or +distribution of Third Party Software is in all respects subject to applicable +license terms of applicable third party right holders. + +5. PRE-RELEASE CODE + +The Licensed Software may contain pre-release code and functionality marked or +otherwise stated as "Technology Preview", "Alpha", "Beta" or similar +designation. Such pre-release code may be present in order to provide +experimental support for new platforms or preliminary versions of one or more +new functionalities. The pre-release code may not be at the level of +performance and compatibility of a final, generally available, product +offering of the Licensed Software. The pre-release parts of the Licensed +Software may not operate correctly, may contain errors and may be substantially +modified by The Qt Company prior to the first commercial product release, if +any. The Qt Company is under no obligation to make pre-release code +commercially available, or provide any Support or Updates relating thereto. The +Qt Company assumes no liability whatsoever regarding any pre-release code, but +any use thereof is exclusively at Licensee's own risk and expense. + +6. LIMITED WARRANTY AND WARRANTY DISCLAIMER + +The Qt Company hereby represents and warrants that it has the power and +authority to grant the rights and licenses granted to Licensee under this +Agreement. + +Except as set forth above, the Licensed Software is licensed to Licensee +"as is" and Licensee's exclusive remedy and The Qt Company's entire liability +for errors in the Licensed Software shall be limited, at The Qt Company's +option, to correction of the error, replacement of the Licensed Software or +return of the applicable fees paid for the defective Licensed Software for the +time period during which the License is not able to utilize the Licensed +Software under the terms of this Agreement. + +TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF +ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER +WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON- +INFRINGEMENT WITH REGARD TO THE LICENSED SOFTWARE. THE QT COMPANY DOES NOT +WARRANT THAT THE LICENSED SOFTWARE WILL SATISFY LICENSEE'S REQUIREMENTS OR THAT +IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE +UNINTERRUPTED. ALL USE OF AND RELIANCE ON THE LICENSED SOFTWARE IS AT THE SOLE +RISK OF AND RESPONSIBILITY OF LICENSEE. + +7. INDEMNIFICATION AND LIMITATION OF LIABILITY + +7.1 Limitation of Liability + +EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, AND (II) +BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO +EVENT SHALL EITHER PARTY BE LIABLE TO THE OTHER PARTY FOR ANY LOSS OF PROFIT, +LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT, SPECIAL, +CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY KIND, +HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THIS AGREEMENT. PARTIES +SPECIFICALLY AGREE THAT LICENSEE'S OBLIGATION TO PAY LICENSE AND OTHER FEES +CORRESPONDING TO ACTUAL USAGE OF LICENSED SOFTWARE HEREUNDER SHALL BE +CONSIDERED AS A DIRECT DAMAGE. + +EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, AND (II) +BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN +NO EVENT SHALL EITHER PARTY'S TOTAL AGGREGATE LIABILITY UNDER THIS AGREEMENT +EXCEED THE AGGREGATE LICENSE FEES PAID OR PAYABLE TO THE QT COMPANY FROM +LICENSEE DURING THE PERIOD OF TWELVE (12) MONTHS IMMEDIATELY PRECEDING THE +EVENT RESULTING IN SUCH LIABILITY. + +THE PROVISIONS OF THIS SECTION 7 ALLOCATE THE RISKS UNDER THIS AGREEMENT +BETWEEN THE QT COMPANY AND LICENSEE AND THE PARTIES HAVE RELIED UPON THE +LIMITATIONS SET FORTH HEREIN IN DETERMINING WHETHER TO ENTER INTO THIS AGREEMENT. + +7.2 Licensee's Indemnification + +Licensee shall indemnify and hold harmless The Qt Company from and against any +claim, injury, judgment, settlement, loss or expense, including attorneys' fees +related to: (a) Licensee's misrepresentation in connection with The Qt Company +or the Licensed Software or breach of this Agreement, (b) the Application or +Device (except where such cause of liability is solely attributable to the +Licensed Software). + +8. SUPPORT, UPDATES AND ONLINE SERVICES + +Upon due payment of the agreed License Fees the Licensee will be eligible to +receive Support and Updates and to use the Online Services during the License +Term, provided, however, that in the event the License Term is longer than 36 +months, Support is provided only for the first 12 months, unless the Parties +specifically otherwise agree. + +Unless otherwise decided by The Company at its free and absolute discretion, +Upgrades will not be included in the Support but may be available subject to +additional fees. + +From time to time The Qt Company may change the Support terms, provided that +during the respective ongoing License Term the level of Support provided by The +Qt Company may not be reduced without the consent of the Licensee. + +Unless otherwise agreed, The Qt Company shall not be responsible for providing +any service or support to Customers. + +9. CONFIDENTIALITY + +Each Party acknowledges that during the Term of this Agreement each Party may +receive information about the other Party's business, business methods, +business plans, customers, business relations, technology, and other +information, including the terms of this Agreement, that is confidential and +of great value to the other Party, and the value of which would be +significantly reduced if disclosed to third parties ("Confidential +Information"). Accordingly, when a Party (the "Receiving Party") receives +Confidential Information from the other Party (the "Disclosing Party"), the +Receiving Party shall only disclose such information to employees and +Contractors on a need to know basis, and shall cause its employees and +employees of its Affiliates to: (i) maintain any and all Confidential +Information in confidence; (ii) not disclose the Confidential Information to a +third party without the Disclosing Party's prior written approval; and (iii) +not, directly or indirectly, use the Confidential Information for any purpose +other than for exercising its rights and fulfilling its responsibilities +pursuant to this Agreement. Each Party shall take reasonable measures to +protect the Confidential Information of the other Party, which measures shall +not be less than the measures taken by such Party to protect its own +confidential and proprietary information. + +Obligation of confidentiality shall not apply to information that (i) is or +becomes generally known to the public through no act or omission of the +Receiving Party; (ii) was in the Receiving Party's lawful possession prior to +the disclosure hereunder and was not subject to limitations on disclosure or +use; (iii) is developed independently by employees or Contractors of the +Receiving Party or other persons working for the Receiving Party who have not +had access to the Confidential Information of the Disclosing Party, as proven +by the written records of the Receiving Party; (iv) is lawfully disclosed to +the Receiving Party without restrictions, by a third party not under an +obligation of confidentiality; or (v) the Receiving Party is legally compelled +to disclose, in which case the Receiving Party shall notify the Disclosing +Party of such compelled disclosure and assert the privileged and confidential +nature of the information and cooperate fully with the Disclosing Party to +limit the scope of disclosure and the dissemination of disclosed Confidential +Information to the minimum extent necessary. + +The obligations under this Section 9 shall continue to remain in force for a +period of five (5) years after the last disclosure, and, with respect to trade +secrets, for so long as such trade secrets are protected under applicable trade +secret laws. + +10. FEES, DELIVERY AND PAYMENT + +10.1 License Fees + +License Fees are described in The Qt Company's standard price list, quote or +Purchase Order confirmation or in an appendix hereto, as the case may be. + +The License Fees shall not be refunded or claimed as a credit in any event or +for any reason whatsoever. + +10.2 Ordering Licenses + +Licensee may purchase Development Licenses and Distribution Licenses pursuant +to agreed pricing terms or, if no specific pricing terms have been agreed upon, +at The Qt Company's standard pricing terms applicable at the time of purchase. + +Licensee shall submit all purchase orders for Development Licenses and +Distribution Licenses to The Qt Company by email or any other method acceptable +to The Qt Company (each such order is referred to herein as a "Purchase Order") +for confirmation, whereupon the Purchase Order shall become binding between the +Parties. + +10.3 Distribution License Packs + +Unless otherwise agreed, Distribution Licenses shall be purchased by way of +Distribution License Packs. + +Upon due payment of the ordered Distribution License Pack(s), the Licensee will +have an account of Distribution Licenses available for installing, bundling or +integrating (all jointly "installing") the Redistributables with the Devices or +for otherwise distributing the Redistributables in accordance with this +Agreement. + +Each time Licensee "installs" or distributes a copy of Redistributables, then +one Distribution License is used, and Licensee's account of available +Distribution Licenses is decreased accordingly. + +Licensee may "install" copies of the Redistributables so long as Licensee has +Distribution Licenses remaining on its account. + +Redistributables will be deemed to have been "installed" into a Device when one +of the following circumstances shall have occurred: a) the Redistributables +have been loaded onto the Device and used outside of the Licensee's premises or +b) the Device has been fully tested and placed into Licensee's inventory +(or sold) for the first time (i.e., Licensee will not be required to use +(or pay for) more than one Distribution License for each individual Device, +e.g. in a situation where a Device is returned to Licensee's inventory after +delivery to a distributor or sale to a Customer). In addition, if Licensee +includes a back-up copy of the Redistributables on a CD-ROM or other storage +medium along with the product, that backup copy of the Redistributables will +not be deemed to have been "installed" and will not require an additional +Distribution License. + +10.4 Payment Terms + +License Fees and any other charges under this Agreement shall be paid by +Licensee no later than thirty (30) days from the date of the applicable invoice +from The Qt Company. + +The Qt Company will submit an invoice to Licensee after the date of this +Agreement and/or after The Qt Company receives a Purchase Order from +Licensee. + +A late payment charge of the lower of (a) one percent per month; or (b) the +interest rate stipulated by applicable law, shall be charged on any unpaid +balances that remain past due. + +The Qt Company shall have the right to suspend, terminate or withhold grants +of all rights to the Licensed Software hereunder, including but not limited to +the Developer License, Distribution License, and Support, should Licensee fail +to make payment in timely fashion. + +10.5 Taxes + +All License Fees and other charges payable hereunder are gross amounts but +exclusive of any value added tax, use tax, sales tax and other taxes, duties or +tariffs ("Taxes"). Such applicable Taxes shall be paid by Licensee, or, where +applicable, in lieu of payment of such Taxes, Licensee shall provide an +exemption certificate to The Qt Company and any applicable authority. + +11 RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS + +11.1 Licensee's Record-keeping + +Licensee shall at all times maintain accurate and up-to-date written records of +Licensee's activities related to the use of Licensed Software and distribution +of Redistributables. The records shall be adequate to determine Licensee's +compliance with the provisions of this Agreement and to demonstrate the number +of Designated Users and Redistributables distributed by Licensee. The records +shall conform to good accounting practices reasonably acceptable to The Qt +Company. + +Licensee shall, within thirty (30) days from receiving The Qt Company's request +to that effect, deliver to The Qt Company a report on Licensee's usage of +Licensed Software, such report to copies of Redistributables distributed by +Licensee during that calendar quarter, and also detailing the number of +undistributed copies of Redistributables made by Licensee and remaining in its +account contain information, in sufficient detail, on (i) amount of users +working with Licensed Software, (ii) copies of Redistributables distributed by +Licensee during that calendar quarter, (iii) number of undistributed copies of +Redistributables and corresponding number of unused Distribution Licenses +remaining on Licensee's account, and (iv) any other information as The Qt +Company may reasonably require from time to time. + +11.2. The Qt Company's Audit Rights + +The Qt Company or an independent auditor acting on behalf of The Qt Company's, +may, upon at least five (5) business days' prior written notice and at its +expense, audit Licensee with respect to the use of the Redistributables, but +not more frequently than once during each 6-month period. Such audit may be +conducted by mail, electronic means or through an in-person visit to Licensee's +place of business. Any such in-person audit shall be conducted during regular +business hours at Licensee's facilities and shall not unreasonably interfere +with Licensee's business activities. The Qt Company or the independent auditor +acting on behalf of The Qt Company shall be entitled to inspect Licensee's +Records. All such Licensee's Records and use thereof shall be subject to an +obligation of confidentiality under this Agreement. + +If an audit reveals that Licensee is using the Licensed Software beyond scope +of the licenses Licensee has paid for, Licensee agrees to immediately pay The +Qt Company any amounts owed for such unauthorized use. + +In addition, in the event the audit reveals a material violation of the terms +of this Agreement (underpayment of more than 5% of License Fees shall always be +deemed a material violation for purposes of this section), then the Licensee +shall pay The Qt Company's reasonable cost of conducting such audit. + +12 TERM AND TERMINATION + +12.1 Term + +This Agreement shall enter into force upon due acceptance by both Parties and +remain in force for as long as there is any Development License(s) in force +("Term"), unless and until terminated pursuant to the terms of this Section 12. + +12.2 Termination by The Qt Company + +The Qt Company shall have the right to terminate this Agreement upon thirty +(30) days prior written notice if the Licensee is in material breach of any +obligation of this Agreement and fails to remedy such breach within such notice +period. + +12.3 Mutual Right to Terminate + +Either Party shall have the right to terminate this Agreement immediately upon +written notice in the event that the other Party becomes insolvent, files for +any form of bankruptcy, makes any assignment for the benefit of creditors, has +a receiver, administrative receiver or officer appointed over the whole or a +substantial part of its assets, ceases to conduct business, or an act +equivalent to any of the above occurs under the laws of the jurisdiction of the +other Party. + +12.4 Parties' Rights and Duties upon Termination + +Upon expiry or termination of the Agreement Licensee shall cease and shall +cause all Designated Users (including those of its Affiliates' and +Contractors') to cease using the Licensed Software and distribution of the +Redistributables under this Agreement. + +Notwithstanding the above, in the event the Agreement expires or is terminated: + +(i) as a result of The Qt Company choosing not to renew the Development +License(s) as set forth in Section 3.1, then all valid licenses possessed by +the Licensee at such date shall be extended to be valid in perpetuity under the +terms of this Agreement and Licensee is entitled to purchase additional +licenses as set forth in Section 10.2; or + +(ii) for reason other than by The Qt Company pursuant to item (i) above or +pursuant to Section 12.2, then the Licensee is entitled, for a period of six +(6) months after the effective date of termination, to continue distribution of +Devices under the Distribution Licenses paid but unused at such effective date +of termination. + +Upon any such termination the Licensee shall destroy or return to The Qt +Company all copies of the Licensed Software and all related materials and will +certify the same to The Qt Company upon its request, provided however that +Licensee may retain and exploit such copies of the Licensed Software as it may +reasonably require in providing continued support to Customers. + +Expiry or termination of this Agreement for any reason whatsoever shall not +relieve Licensee of its obligation to pay any License Fees accrued or payable +to The Qt Company prior to the effective date of termination, and Licensee +shall immediately pay to The Qt Company all such fees upon the effective date +of termination. Termination of this Agreement shall not affect any rights of +Customers to continue use of Applications and Devices (and therein incorporated +Redistributables). + +12.5 Extension in case of bankruptcy + +In the event The Qt Company is declared bankrupt under a final, non-cancellable +decision by relevant court of law, and this Agreement is not, at the date of +expiry of the Development License(s) pursuant to Section 3.1, assigned to +party, who has assumed The Qt Company's position as a legitimate licensor of +Licensed Software under this Agreement, then all valid licenses possessed by +the Licensee at such date of expiry, and which the Licensee has not notified +for expiry, shall be extended to be valid in perpetuity under the terms of +this Agreement. + +13. GOVERNING LAW AND LEGAL VENUE + +In the event this Agreement is in the name of The Qt Company Inc., a Delaware +Corporation, then: + +(i) this Agreement shall be construed and interpreted in accordance with the +laws of the State of California, USA, excluding its choice of law provisions; + +(ii) the United Nations Convention on Contracts for the International Sale of +Goods will not apply to this Agreement; and + +(iii) any dispute, claim or controversy arising out of or relating to this +Agreement or the breach, termination, enforcement, interpretation or validity +thereof, including the determination of the scope or applicability of this +Agreement to arbitrate, shall be determined by arbitration in San Francisco, +USA, before one arbitrator. The arbitration shall be administered by JAMS +pursuant to JAMS' Streamlined Arbitration Rules and Procedures. Judgment on the +Award may be entered in any court having jurisdiction. This Section shall not +preclude parties from seeking provisional remedies in aid of arbitration from a +court of appropriate jurisdiction. + +In the event this Agreement is in the name of The Qt Company Ltd., a Finnish +Company, then: + +(i) this Agreement shall be construed and interpreted in accordance with the +laws of Finland, excluding its choice of law provisions; + +(ii) the United Nations Convention on Contracts for the International Sale of +Goods will not apply to this Agreement; and + +(iii) any disputes, controversy or claim arising out of or relating to this +Agreement, or the breach, termination or validity thereof shall be shall be +finally settled by arbitration in accordance with the Arbitration Rules of +Finland Chamber of Commerce. The arbitration tribunal shall consist of one (1), +or if either Party so requires, of three (3), arbitrators. The award shall be +final and binding and enforceable in any court of competent jurisdiction. The +arbitration shall be held in Helsinki, Finland and the process shall be +conducted in the English language. This Section shall not preclude parties from +seeking provisional remedies in aid of arbitration from a court of appropriate +jurisdiction. + +14. GENERAL PROVISIONS + +14.1 No Assignment + +Except in the case of a merger or sale of substantially all of its corporate +assets, Licensee shall not be entitled to assign or transfer all or any of its +rights, benefits and obligations under this Agreement without the prior written +consent of The Qt Company, which shall not be unreasonably withheld or delayed. +The Qt Company shall be entitled to freely assign or transfer any of its +rights, benefits or obligations under this Agreement. + +14.2 No Third Party Representations + +Licensee shall make no representations or warranties concerning the Licensed +Software on behalf of The Qt Company. Any representation or warranty Licensee +makes or purports to make on The Qt Company's behalf shall be void as to The +Qt Company. + +14.3 Surviving Sections + +Any terms and conditions that by their nature or otherwise reasonably should +survive termination of this Agreement shall so be deemed to survive. + +14.4 Entire Agreement + +This Agreement, the exhibits hereto, the License Certificate and any applicable +Purchase Order constitute the complete agreement between the Parties and +supersedes all prior or contemporaneous discussions, representations, and +proposals, written or oral, with respect to the subject matters discussed +herein. + +In the event of any conflict or inconsistency between this Agreement and any +Purchase Order, the terms of this Agreement will prevail over the terms of the +Purchase Order with respect to such conflict or inconsistency. + +Parties specifically acknowledge and agree that this Agreement prevails over +any click-to-accept or similar agreements the Designated Users may need to +accept online upon download of the Licensed Software, as may be required by +The Qt Company's applicable processes relating to Licensed Software. + +14.5 Modifications + +No modification of this Agreement shall be effective unless contained in a +writing executed by an authorized representative of each Party. No term or +condition contained in Licensee's Purchase Order shall apply unless expressly +accepted by The Qt Company in writing. + +14.6 Force Majeure + +Except for the payment obligations hereunder, neither Party shall be liable to +the other for any delay or non-performance of its obligations hereunder in the +event and to the extent that such delay or non-performance is due to an event +of act of God, terrorist attack or other similar unforeseeable catastrophic +event that prevents either Party for fulfilling its obligations under this +Agreement and which such Party cannot avoid or circumvent ("Force Majeure +Event"). If the Force Majeure Event results in a delay or non-performance of a +Party for a period of three (3) months or longer, then either Party shall have +the right to terminate this Agreement with immediate effect without any +liability (except for the obligations of payment arising prior to the event of +Force Majeure) towards the other Party. + +14.7 Notices + +Any notice given by one Party to the other shall be deemed properly given and +deemed received if specifically acknowledged by the receiving Party in writing +or when successfully delivered to the recipient by hand, fax, or special +courier during normal business hours on a business day to the addresses +specified for each Party on the signature page. Each communication and document +made or delivered by one Party to the other Party pursuant to this Agreement +shall be in the English language. + +14.8 Export Control + +Licensee acknowledges that the Redistributables may be subject to export +control restrictions under the applicable laws of respective countries. +Licensee shall fully comply with all applicable export license restrictions +and requirements as well as with all laws and regulations relating to the +Redistributables and exercise of licenses hereunder and shall procure all +necessary governmental authorizations, including without limitation, all +necessary licenses, approvals, permissions or consents, where necessary for the +re-exportation of the Redistributables, Applications and/or Devices. + +14.9 No Implied License + +There are no implied licenses or other implied rights granted under this +Agreement, and all rights, save for those expressly granted hereunder, shall +remain with The Qt Company and its licensors. In addition, no licenses or +immunities are granted to the combination of the Licensed Software with any +other software or hardware not delivered by The Qt Company under this Agreement. + +14.10 Attorney Fees + +The prevailing Party in any action to enforce this Agreement shall be entitled +to recover its attorney's fees and costs in connection with such action. + +14.11 Severability + +If any provision of this Agreement shall be adjudged by any court of competent +jurisdiction to be unenforceable or invalid, that provision shall be limited or +eliminated to the minimum extent necessary so that this Agreement shall +otherwise remain in full force and effect and enforceable. + + +IN WITNESS WHEREOF, the Parties hereto, intending to be legally bound hereby, +have caused this Agreement to be executed by Licensee's authorized +representative installing the Licensed Software and accepting the terms +hereof in connection therewith. + + +Appendix 1 + +1. Parts of the Licensed Software that are permitted for distribution in +object code form only ("Redistributables") under this Agreement: + +- The Licensed Software's Qt Essentials and Qt Add-on libraries +- The Licensed Software's configuration tool ("qtconfig") +- The Licensed Software's help tool ("Qt Assistant") +- The Licensed Software's internationalization tools ("Qt Linguist", "lupdate", + "lrelease") +- The Licensed Software's QML ("Qt Quick") launcher tool ("qmlscene" or + "qmlviewer") +- The Licensed Software's installer framework + +2. Parts of the Licensed Software that are not permitted for distribution +include, but are not limited to: + +- The Licensed Software's source code and header files +- The Licensed Software's documentation +- The Licensed Software's documentation generation tool ("qdoc") +- The Licensed Software's tool for writing makefiles ("qmake") +- The Licensed Software's Meta Object Compiler ("moc") +- The Licensed Software's User Interface Compiler ("uic") +- The Licensed Software's Resource Compiler ("rcc") +- The Licensed Software's parts of the IDE tool ("Qt Creator") +- The Licensed Software's parts of the Design tools ("Qt 3D Studio" or + "Qt Quick Designer") +- The Licensed Software's Emulator -- cgit v1.2.3 From 72d711356c309b63aeceec46a095ea9567f8936e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 28 Jun 2018 13:40:26 +0200 Subject: Update submodules on '5.11' in qt5 Change-Id: I2d450d444d40d129003461329fa5058ca1c0f140 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtserialbus | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qt3d b/qt3d index 7b2d0fdb..895cd926 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7b2d0fdba63c0aca5e37f59706455618787a44eb +Subproject commit 895cd926ba6d420e72a7d2ae2bb0624ab7aeb791 diff --git a/qtbase b/qtbase index dbad7bd2..9f1568d1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit dbad7bd2345df603a98d7cd35fceb2e9c1998250 +Subproject commit 9f1568d18c36186c239138306442de2508c79bc0 diff --git a/qtconnectivity b/qtconnectivity index c754e16c..9b7a4c10 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c754e16ceddaf6826d2a74775df8409b3278d5b8 +Subproject commit 9b7a4c10b67dd7d89ed30f1f94d8982dab47ded0 diff --git a/qtdeclarative b/qtdeclarative index 053e76ab..ffeaac70 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 053e76ab80f72eb026894fc05ee83593ea2079fd +Subproject commit ffeaac704efc9eb85464d0a401d98e28991ec4d3 diff --git a/qtdoc b/qtdoc index cc95eaf6..e9f4b5e0 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit cc95eaf6e3dc887a0f54fe638b67b16715e2cb9a +Subproject commit e9f4b5e081d6c985d718916bc504c6b1f1a1d93c diff --git a/qtgamepad b/qtgamepad index 50565322..8f7dea83 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 505653220f9c609cfbedcb7d81f1f30bf6d247e5 +Subproject commit 8f7dea835e63cd78648090fbc19ad7cb23ac642c diff --git a/qtlocation b/qtlocation index 71bc98bf..178d6a32 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 71bc98bf309ce433afb80344a7356e13b310c5c5 +Subproject commit 178d6a3295336a43c33b8d39cfd36de638e9d4f4 diff --git a/qtmultimedia b/qtmultimedia index 2f7b5465..135c762e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2f7b546540c11a4697ee7bc363c7ac7cc5b053b4 +Subproject commit 135c762ea0bb2c13f9568b9c85b10633f0c6ce34 diff --git a/qtpurchasing b/qtpurchasing index 9e1a5ea7..44a9a2a2 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 9e1a5ea738c1c9ade78bd0dee4a49e767a674fa1 +Subproject commit 44a9a2a2f061660ac61cad4b47c7301c63135e88 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6cf6594a..dabf5d2e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6cf6594aa7bb6cdb84d0fca9df6c099b14d2affc +Subproject commit dabf5d2ea0774564f29bb756b895fc9a9975b129 diff --git a/qtscript b/qtscript index 23abc3bd..9acfa7d2 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 23abc3bdab1f471ec515a6d5b71dccc3d075a1fa +Subproject commit 9acfa7d281efceec38ef8e8bdd03376993fd2594 diff --git a/qtserialbus b/qtserialbus index 06149b7b..9fe2ea2e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 06149b7bdf7573b97e76af6d83d5c0f5c777e305 +Subproject commit 9fe2ea2e0d8e696d7ba7d2dd03325007c2e415cc diff --git a/qtspeech b/qtspeech index 7bc90ab3..afc9e36a 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 7bc90ab3d8c59bab7503ccd54f123d777c6c7951 +Subproject commit afc9e36a93e9b5d00abc6ecc1424179453c16773 diff --git a/qtsvg b/qtsvg index 234aa6d3..59c8f354 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 234aa6d3bda9b47177224a17b4e37d52bb2c2c55 +Subproject commit 59c8f354644b6016c6e0ac45e60d821544c6d4d2 diff --git a/qttools b/qttools index 8f3d0a66..fd797fc9 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 8f3d0a6653b99c5eb7963b7fc889cb444350a4c2 +Subproject commit fd797fc9441261d0679d60b0af3682966c862875 diff --git a/qtwayland b/qtwayland index 590d2e31..56e01f9e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 590d2e313c5a10dc9c7d61a654ada451e5df82aa +Subproject commit 56e01f9e3372446d20f0bb70bed0b88348f2a74b diff --git a/qtwebengine b/qtwebengine index a66d4cd8..f4d421f5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a66d4cd82972996d76edff52d17464c150dec6a6 +Subproject commit f4d421f5a3594323832157eb142bf2261ae9a454 diff --git a/qtwebglplugin b/qtwebglplugin index eb9e611e..bdbbafb0 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit eb9e611e8cb9196fd0b7ffaca851c6fdd97e7511 +Subproject commit bdbbafb0f842530757c4e1a13072e0d3a514d1cb -- cgit v1.2.3 From 4a7366f96032d8875cec8b738c34497bbe28b649 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 30 Apr 2018 09:28:12 +0300 Subject: Provisioning: Refactor libclang installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Libclang must use cached url (ci-files01-hki) to reduce the download time Libclang release_60 versions were rebuild which requires sha1 changes Task-number: QTQAINFRA-1966 Task-number: QTQAINFRA-2100 Change-Id: Iddf47a2a3a5bc38dbed684320120164bb40c028c Reviewed-by: Simo Fält --- coin/provisioning/common/shared/sw_versions.txt | 1 - coin/provisioning/common/unix/libclang.sh | 41 +++++++------ coin/provisioning/common/windows/libclang.ps1 | 69 +++++++++------------- .../qtci-linux-RHEL-6.6-x86_64/08-libclang.sh | 6 +- .../qtci-linux-RHEL-7.4-x86_64/05-libclang.sh | 9 +-- .../qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh | 8 +-- .../qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh | 9 +-- .../qtci-macos-10.12-x86_64/27-libclang.sh | 2 +- .../qtci-osx-10.11-x86_64/27-libclang.sh | 5 +- 9 files changed, 63 insertions(+), 87 deletions(-) delete mode 100644 coin/provisioning/common/shared/sw_versions.txt diff --git a/coin/provisioning/common/shared/sw_versions.txt b/coin/provisioning/common/shared/sw_versions.txt deleted file mode 100644 index fb2fecb9..00000000 --- a/coin/provisioning/common/shared/sw_versions.txt +++ /dev/null @@ -1 +0,0 @@ -libclang_version="6.0" diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index f6ff4507..645cf6ec 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -42,30 +42,37 @@ set -e # shellcheck source=./check_and_set_proxy.sh source "${BASH_SOURCE%/*}/check_and_set_proxy.sh" +# shellcheck source=./SetEnvVar.sh source "${BASH_SOURCE%/*}/SetEnvVar.sh" +# shellcheck source=./DownloadURL.sh +source "${BASH_SOURCE%/*}/DownloadURL.sh" -BASEDIR=$(dirname "$0") -# shellcheck source=../shared/sw_versions.txt -. "$BASEDIR/../shared/sw_versions.txt" -url=$1 -sha1=$2 -version=$3 -if [ $# -eq 0 ] - then - # The default values are for macOS package - echo "Using macOS defaults" +libclang_version=6.0 +libclang_version_Rhel6=4.0 + +if uname -a |grep -q Darwin; then + version=$libclang_version + url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-mac.7z" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-mac.7z" + sha1="0af8ab8c1174faf4b721d079587190fc32ea8364" +elif uname -a |grep -q "el6"; then + version=$libclang_version_Rhel6 + url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z" + sha1="c7466109628418a6aa3db8b3f5825f847f1c4952" +else version=$libclang_version - url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-mac.7z" - sha1="10e48167b61726b20517172f8aff80fa1d9a379b" + url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" + sha1="ef59b699f4fcce2e45108b3ff04cc7471c1c4abe" fi -zip="libclang.7z" +zip="/tmp/libclang.7z" destination="/usr/local/libclang-$version" -curl --fail -L --retry 5 --retry-delay 5 -o "$zip" "$url" -echo "$sha1 $zip" | sha1sum --check -7z x "$zip" -o/tmp/ -rm -rf "$zip" +DownloadURL $url_cached $url $sha1 $zip +7z x $zip -o/tmp/ +rm -rf $zip sudo mv /tmp/libclang "$destination" diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index b0705105..dd21f424 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -5,79 +5,66 @@ param( ) . "$PSScriptRoot\helpers.ps1" +$libclang_version="6.0" + # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). # The Clang library (C-bindings), version 3.9 or higher is required for building. # Starting from Qt 5.11 QDoc requires Clang to parse C++ -Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object { - $var = $_.Split('=') - New-Variable -Name $var[0] -Value $var[1] -Force - $libclang_version = $libclang_version -replace '["."]' -} - -$zip = Get-DownloadLocation "libclang.7z" $baseDestination = "C:\Utils\libclang-" + $libclang_version + "-" + $toolchain -function setURL() { - $script:url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z" +function install() { + + param( + [string]$sha1=$1, + [string]$destination=$2 + ) + + $zip = "c:\users\qt\downloads\libclang.7z" + + $libclang_version = $libclang_version -replace '["."]' + $script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z" + $script:CachedUrl = "http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z" + + Download $OfficialUrl $CachedUrl $zip + Verify-Checksum $zip $sha1 + Extract-7Zip $zip C:\Utils\ + Rename-Item C:\Utils\libclang $destination + Remove-Item -Force -Path $zip } $toolchainSuffix = "" if ( $toolchain -eq "vs2015" ) { if ( $archVer -eq 64 ) { - $sha1 = "37afa18d243a50c05bee5c6e16b409ed526ec17a" + $sha1 = "a399af949271e6d3bfc578ea2c17ff1d6c6318b9" $destination = $baseDestination + "-64" - setURL - Download $url $url $zip - Verify-Checksum $zip $sha1 - - Extract-7Zip $zip C:\Utils\ - Rename-Item C:\Utils\libclang $destination - Remove-Item -Force -Path $zip + install $sha1 $destination } $archVer=32 - $sha1 = "812b6089c6da99ced9ebebbd42923bd96590519d" + $sha1 = "aa3f68f1cfa87780a4631a98ce883d3d9cb94330" $destination = $baseDestination + "-32" - setURL - Download $url $url $zip - Verify-Checksum $zip $sha1 - - Extract-7Zip $zip C:\Utils\ - Rename-Item C:\Utils\libclang $destination - Remove-Item -Force -Path $zip + install $sha1 $destination $toolchainSuffix = "msvc" } if ( $toolchain -eq "mingw" ) { if ( $archVer -eq 64 ) { - $sha1 = "1233e6c008b90d89483df0291a597a0bac426d29" + $sha1 = "b382502f82d1cfa7d3cc3016d909d37edc19c22c" $destination = $baseDestination + "-64" - setURL - Download $url $url $zip - Verify-Checksum $zip $sha1 - - Extract-7Zip $zip C:\Utils\ - Rename-Item C:\Utils\libclang $destination - Remove-Item -Force -Path $zip + install $sha1 $destination } $archVer=32 - $sha1 = "2d6ceab0e1a05e2b19fe615c57b64d36977b4933" + $sha1 = "cbc68e0f93f4cb0ed7084a045b7c07a1980a2a44" $destination = $baseDestination + "-32" - setURL - Download $url $url $zip - Verify-Checksum $zip $sha1 - - Extract-7Zip $zip C:\Utils\ - Rename-Item C:\Utils\libclang $destination - Remove-Item -Force -Path $zip + install $sha1 $destination $toolchainSuffix = "mingw" } diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh index 5f3715de..9eb7e086 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh @@ -35,9 +35,5 @@ set -ex BASEDIR=$(dirname "$0") -# With RHEL 6.6 we are using different lib clang than others -VERSION=4.0 -URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z" -SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952" - +# shellcheck source=../common/unix/libclang.sh "$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh index ed589644..7074cbc1 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh @@ -2,10 +2,5 @@ set -ex BASEDIR=$(dirname "$0") -# shellcheck source=../common/shared/sw_versions.txt -. "$BASEDIR/../common/shared/sw_versions.txt" -VERSION=$libclang_version -URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" -SHA1="71194c4d6065a62ac1a891123df79fd9da311bf0" - -"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION" +# shellcheck source=../common/unix/libclang.sh +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh index 1589b004..331a14d9 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh @@ -1,9 +1,5 @@ #!/usr/bin/env bash BASEDIR=$(dirname "$0") -. $BASEDIR/../common/shared/sw_versions.txt -VERSION=$libclang_version -URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" -SHA1="71194c4d6065a62ac1a891123df79fd9da311bf0" - -$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION" +# shellcheck source=../common/unix/libclang.sh +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh index 5113633a..bbe2b4b4 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh @@ -3,10 +3,5 @@ set -ex BASEDIR=$(dirname "$0") -# shellcheck source=../common/shared/sw_versions.txt -. "$BASEDIR/../common/shared/sw_versions.txt" -VERSION=$libclang_version -URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" -SHA1="71194c4d6065a62ac1a891123df79fd9da311bf0" - -"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION" +# shellcheck source=../common/unix/libclang.sh +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh index fea11e01..d68bf90a 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh @@ -3,5 +3,5 @@ set -ex BASEDIR=$(dirname "$0") -# There is only one mac package and common script uses it as a default +# There is only one mac package $BASEDIR/../common/unix/libclang.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh b/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh index fea11e01..91872201 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh @@ -3,5 +3,6 @@ set -ex BASEDIR=$(dirname "$0") -# There is only one mac package and common script uses it as a default -$BASEDIR/../common/unix/libclang.sh +# There is only one mac package +# shellcheck source=../common/unix/libclang.sh +"$BASEDIR/../common/unix/libclang.sh" -- cgit v1.2.3 From 74fd490884e645094d3f03cd9c0d0e0d2b73954a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 27 Apr 2018 10:18:05 +0300 Subject: Provisioning: Add force option when unmounting squish MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sometimes unmount of squish fail because resource busy even if the installation is already succeeded. To avoid this let's add force option to make sure unmounting works every time. Task-number: QTQAINFRA-1964 Change-Id: Icacd01341d09577d9880e3ed208cb6ea18a7ac4f Reviewed-by: Joni Jäntti Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/unix/squishInstall.sh | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index ab0102ec..c946dfdc 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -90,6 +90,11 @@ function MountAndInstall { squishLicenseDir="/root" fi + function UnMount { + echo "Unmounting $mountFolder" + sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder" + } + targetFileMount="$mountFolder"/"$targetFile" echo "Mounting $url to $mountFolder" @@ -111,20 +116,20 @@ function MountAndInstall { target="$targetDirectory" fi sudo tar -xzf "$targetFileMount" --directory "$target" - echo "Unmounting $mountFolder" - sudo umount "$mountFolder" + UnMount elif [[ $targetFile == *.dmg ]]; then echo "'dmg-file', no need to uncompress" - sudo cp "$targetFileMount" /tmp - sudo umount "$mountFolder" + sudo cp $targetFileMount /tmp + UnMount sudo hdiutil attach "/tmp/$targetFile" sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" - sudo hdiutil unmount /Volumes/froglogic\ Squish/ + mountFolder="/Volumes/froglogic Squish" + UnMount elif [[ $targetFile == *.run ]]; then echo "'run-file', no need to uncompress" - sudo cp "$targetFileMount" "$targetDirectory" - sudo umount "$mountFolder" - sudo "$targetDirectory/$targetFile" unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1 + sudo cp $targetFileMount $targetDirectory + UnMount + sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1 sudo rm -fr "$targetDirectory/$targetFile" if uname -a |grep -q "Ubuntu"; then sudo mkdir /usr/lib/tcl8.6 -- cgit v1.2.3 From ecb01d283c1cf5d9e31bc96510086c347a3c505d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 24 May 2018 13:17:27 +0300 Subject: Provisioning: Fetch icu from ci-files01 instead of master.qt.io MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia27e68cb94ab0744ce11cfa74c90e118c1f0e4b3 Reviewed-by: Tony Sarajärvi --- .../qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh | 24 ++++++++++++++-------- .../qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh | 17 ++++++++------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh index 67c17954..90d4199f 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the test suite of the Qt Toolkit. @@ -33,6 +33,9 @@ ## ############################################################################# +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + # This script installs the right ICU version set -ex @@ -42,29 +45,31 @@ sha1="f2eab775c04ce5f3bdae6c47d06b62158b5d6753" function Install7ZPackageFromURL { url=$1 - expectedSha1=$2 - targetDirectory=$3 + urlExt=$2 + expectedSha1=$3 + targetDirectory=$4 targetFile=$(mktemp) - wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url" - echo "$expectedSha1 $targetFile" | sha1sum --check + DownloadURL "$url" "$urlExt" "$expectedSha1" "$targetFile" sudo /usr/local/bin/7z x -yo"$targetDirectory" "$targetFile" rm "$targetFile" } echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation" -baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z" -Install7ZPackageFromURL "$baseBinaryPackageURL" "$sha1" "/usr/lib64" +baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z" +baseBinaryPackageExternalUrl="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z" +Install7ZPackageFromURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalUrl" "$sha1" "/usr/lib64" echo "Installing custom ICU devel packages on RHEL" sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df" -develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z" +develPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z" +develPackageExternalUrl="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z" tempDir=$(mktemp -d) # shellcheck disable=SC2064 trap "sudo rm -fr $tempDir" EXIT -Install7ZPackageFromURL "$develPackageURL" "$sha1Dev" "$tempDir" +Install7ZPackageFromURL "$develPackageURL" "$develPackageExternalUrl" "$sha1Dev" "$tempDir" sudo cp -a "$tempDir/lib"/* /usr/lib64 sudo cp -a "$tempDir"/* /usr/ @@ -72,3 +77,4 @@ sudo /sbin/ldconfig # Storage version information to ~/versions.txt, which is used to print version information to provision log. echo "ICU = $icuVersion" >> ~/versions.txt + diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh index cb23bbca..7c4d46dd 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,6 +33,9 @@ ## ############################################################################# +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + set -ex # This script will install ICU @@ -40,16 +43,17 @@ set -ex icuVersion="56.1" icuLocation="/usr/lib64" sha1="6dd9ca6b185681a7ddc4bb94fd7fced27647a21c" -baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z" +baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z" +baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z" sha1Dev="bffde26cdea752bee0edd281820c57f1adac3864" -develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z" +develPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z" +develPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z" echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation" targetFile=$(mktemp) -wget --tries=5 --waitretry=5 --output-document="$targetFile" "$baseBinaryPackageURL" -echo "$sha1 $targetFile" | sha1sum --check +DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile" sudo 7z x -y -o/usr/lib64 "$targetFile" sudo rm "$targetFile" @@ -58,8 +62,7 @@ echo "Installing custom ICU devel packages on RHEL" tempDir=$(mktemp -d) targetFile=$(mktemp) -wget --tries=5 --waitretry=5 --output-document="$targetFile" "$develPackageURL" -echo "$sha1Dev $targetFile" | sha1sum --check +DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile" 7z x -y -o"$tempDir" "$targetFile" sudo cp -a "$tempDir"/lib/* /usr/lib64 -- cgit v1.2.3 From 0a2b499cca001147ae0db6d137afb80d8c70cd43 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 27 Jun 2018 13:12:02 +0200 Subject: Remove unused libclang installations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don't need to install the MinGW builds of libclang 6.0 for configurations where the Qt MinGW build can't use them. Task-number: QTBUG-68064 Change-Id: Id9183ccfc15a7a81edb67df371075d584e5cbae8 Reviewed-by: Simo Fält --- coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 | 2 -- coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 | 1 - 2 files changed, 3 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 index 4d56d612..8da8cc5a 100644 --- a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1 @@ -1,3 +1 @@ -# Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat -. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw $False . "$PSScriptRoot\..\common\windows\libclang.ps1" 32 vs2015 diff --git a/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 deleted file mode 100644 index 375deed3..00000000 --- a/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw -- cgit v1.2.3 From 3e044c71b92617eb8eb794edd30d94f57d9524ac Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 30 Jun 2018 04:31:58 +0300 Subject: Update submodules on '5.11' in qt5 Change-Id: Icb4cd2f6afe9a7aa4c3000a7006471afd141f562 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtcharts | 2 +- qtscript | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 9f1568d1..0ac09c40 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9f1568d18c36186c239138306442de2508c79bc0 +Subproject commit 0ac09c40f28987169786b3063af423e9fe93c6b8 diff --git a/qtcharts b/qtcharts index 0c0b63fc..3b0ab3f1 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 0c0b63fc6c27ac2b4c14dde2a3658c94b6f78ba4 +Subproject commit 3b0ab3f12fe49e81d590b41254ece4f18c83bd1a diff --git a/qtscript b/qtscript index 9acfa7d2..1d229473 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 9acfa7d281efceec38ef8e8bdd03376993fd2594 +Subproject commit 1d2294735536c53fca8e56ed4b262c4bca6b4d29 diff --git a/qtwayland b/qtwayland index 56e01f9e..4d5af47c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 56e01f9e3372446d20f0bb70bed0b88348f2a74b +Subproject commit 4d5af47cd679ef760c4522f731169da08f577483 diff --git a/qtwebengine b/qtwebengine index f4d421f5..db7bfc56 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f4d421f5a3594323832157eb142bf2261ae9a454 +Subproject commit db7bfc5604d5a0d951316ce7d42e90cc18ae63f1 -- cgit v1.2.3