Compare commits

...

26 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
dd11f01de7 Update submodules on '5.15.1' in qt/qt5
Change-Id: I2c7abaccce21e1b070cb2f63ab5d6b2e107eb280
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-09-03 11:35:27 +00:00
Qt Submodule Update Bot
b916e0db22 Update submodules on '5.15.1' in qt/qt5
Change-Id: Ifca7a53c775048040b36b4f7cd87b4513b349aef
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-09-03 04:18:07 +00:00
Qt Submodule Update Bot
39d852d05a Update submodules on '5.15.1' in qt/qt5
Change-Id: I2367511bee1b96ff551d3906ddede0c8e066834b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-09-01 04:09:42 +00:00
Qt Submodule Update Bot
0d62fbdeb8 Update submodules on '5.15.1' in qt/qt5
Change-Id: I0a9581a3691abb5b31333294d85a83c0425a908e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-08-27 11:56:46 +00:00
Jani Heikkinen
51e21dcadd Adjust submodule branches 2020-08-21 13:06:35 +03:00
Qt Submodule Update Bot
f524b6a79d Update submodules on '5.15' in qt/qt5
Change-Id: Ic44cdbb7948ddaa74d1ee561676f8298cacff400
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-08-20 13:50:24 +02:00
Tony Sarajärvi
e5488354ca Enable autotests on SLES 15 and mark it insignificant
Task-number: QTQAINFRA-2852
Task-number: QTQAINFRA-3872
Change-Id: I19fbd4907b3c3846c6eac245b48ff887015e5520
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-08-19 07:30:49 +00:00
Qt Submodule Update Bot
27ffd5c6b2 Update submodules on '5.15' in qt/qt5
Change-Id: I4c68c3e5623145f217fa2d3572beeaaaa62c0efb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-08-06 06:02:28 +02:00
Qt Submodule Update Bot
b2ca6cf26b Update submodules on '5.15' in qt/qt5
Change-Id: I5c9816e36ce8af564e3cedd42315b3a84341e486
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-08-05 06:50:12 +02:00
Simo Fält
49825be2dc Provisioning: Fix PYTHON3_WHEEL_CACHE pointing to wrong dir
Earlier we set the env variable point to latest Python install. It
did work by accident, while the default python was installed as last.
Now each python install has its own matching ENV variable that can
be used buildtime. The PYTHON3_WHEEL_CACHE will now point to 64 bit
default Python3, while the variable is already used in Qt codebase.

Change-Id: I6a67936c06ed0209ef9e903120f2416aaa8eb3ff
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 969acbce6e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-07-30 20:40:42 +00:00
Qt Submodule Update Bot
8066f8ef9f Update submodules on '5.15' in qt/qt5
Change-Id: Ia0b40c1573d9357fe7b927c92f425b5ddb6b7be4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-07-30 06:17:41 +02:00
Qt Submodule Update Bot
a8f008d5a5 Update submodules on '5.15' in qt/qt5
Change-Id: I77111de046ac4b5bef24a0eb09cb0eb4c3ecf39e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-07-28 23:46:18 +02:00
Qt Submodule Update Bot
8c7592b5c4 Update submodules on '5.15' in qt/qt5
Change-Id: I9ea6466cfc310be49b31a9bda80e4fb0434335c0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-07-27 23:46:28 +02:00
Qt Submodule Update Bot
c129f9983d Update submodules on '5.15' in qt/qt5
Change-Id: Icfe485415e0e4309e65389e79fba92c725bebc3a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-07-26 23:45:56 +02:00
Toni Saario
44fe19f004 Provisioning: Add delay after network setting change
In many cases without waiting, next script would be missing network
and fails.

Change-Id: Iab50945716860618b495029ce179183d844dc98a
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 3271bb2fe2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-07-22 09:28:45 +00:00
Simo Fält
b6363e91e9 Provisioning: Fix Python3 install in 32 bit win10
There is no 32 bit win10 configurations in CI, so we do not verify
any of the provisioning changes on it.

Change-Id: I1c1e183908ffb09be4e2992ccbd1da7af2640181
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit bdea3c8164)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-07-21 07:49:43 +00:00
Qt Submodule Update Bot
ac1bc46838 Update submodules on '5.15' in qt/qt5
Change-Id: Iab2c72e5478cca49622c4c32803a4c252cb051fc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-07-20 23:46:00 +02:00
Qt Submodule Update Bot
9972ae9fb6 Update submodules on '5.15' in qt/qt5
Change-Id: Ic0b50278e902cc323f154d4d57be6e5de16f7742
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-07-18 23:47:04 +02:00
Qt Submodule Update Bot
93a2636e0f Update submodules on '5.15' in qt/qt5
Change-Id: I68ecb37a35622c14aea12aac3a32e5ed9f15f764
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-07-17 23:46:34 +02:00
Simo Fält
5442f9a23a Provisioning: Fix Python3 install PS script usage
Change-Id: I843c861804cf70b91553fac680797550a4f4af64
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-07-17 10:36:04 +03:00
Simo Fält
7339218edd Provisioning: Install Python 3.8 for testing Qt for Python
This installs Python 3.8.1 to be used with Qt for Python. It keeps
the old 3.6 as a default python3.

Change-Id: I8ea121514f6a4092f700688363c282cbea37a75b
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 607b33aab2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-07-17 10:35:58 +03:00
Qt Submodule Update Bot
73765a6885 Update submodules on '5.15' in qt/qt5
Change-Id: Ifd9cc2d935c93978ae6e2d115dfc184bb02af4b2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-07-16 23:46:32 +02:00
Qt Submodule Update Bot
093f748d82 Update submodules on '5.15' in qt/qt5
Change-Id: I7279bdd01f6cb8017ce6e07d7f5dd687ea26d7b6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-07-16 23:07:45 +02:00
Qt Submodule Update Bot
f399972a0d Update submodules on '5.15' in qt/qt5
Change-Id: I00030b79499d047c86c451b1151e13745a76102a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-07-10 18:47:06 +02:00
Qt Submodule Update Bot
192bd350fb Update submodules on '5.15' in qt/qt5
Change-Id: Ifb0cc0c2a50d82661972861d80b447fb80c92706
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-07-07 12:50:24 +02:00
Liang Qi
7585da561e Update submodules on '5.15' in qt/qt5
Change-Id: I19249b4e49018d054a05a247abc44ecd3232821e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-07-06 08:51:12 +02:00
52 changed files with 140 additions and 101 deletions

84
.gitmodules vendored
View File

@@ -1,60 +1,60 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 5.15
branch = 5.15.1
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
branch = 5.15
branch = 5.15.1
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
branch = 5.15
branch = 5.15.1
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
branch = 5.15
branch = 5.15.1
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
branch = 5.15
branch = 5.15.1
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
recommends = qtdeclarative
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = 5.15
branch = 5.15.1
status = deprecated
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 5.15
branch = 5.15.1
status = essential
priority = 30
[submodule "qtdoc"]
@@ -62,7 +62,7 @@
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
path = qtdoc
url = ../qtdoc.git
branch = 5.15
branch = 5.15.1
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -83,14 +83,14 @@
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
path = qtlocation
url = ../qtlocation.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -123,99 +123,99 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad
path = qt3d
url = ../qt3d.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
branch = 5.15
branch = 5.15.1
status = essential
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtserialbus"]
depends = qtbase
recommends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtwebengine"]
depends = qtdeclarative
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
path = qtwebengine
url = ../qtwebengine.git
branch = 5.15
branch = 5.15.1
status = addon
priority = 10
[submodule "qtcanvas3d"]
@@ -229,98 +229,98 @@
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
recommends = qtimageformats
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = 5.15
branch = 5.15.1
status = essential
[submodule "qtpurchasing"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtpurchasing
url = ../qtpurchasing.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
path = qtwebglplugin
url = ../qtwebglplugin.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtlottie"]
depends = qtbase qtdeclarative
path = qtlottie
url = ../qtlottie.git
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtquicktimeline"]
depends = qtbase qtdeclarative
path = qtquicktimeline
url = ../qtquicktimeline
branch = 5.15
branch = 5.15.1
status = addon
[submodule "qtquick3d"]
depends = qtbase qtdeclarative
path = qtquick3d
url = ../qtquick3d.git
branch = 5.15
branch = 5.15.1
status = addon

View File

@@ -73,7 +73,7 @@ Configurations:
-
Template: 'qtci-linux-SLES-15-x86_64'
Compiler: 'GCC'
Features: ['DisableTests']
Features: ['Insignificant']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'

View File

@@ -1 +1,2 @@
Disable-NetAdapterLso Ethernet
Start-Sleep -s 15 # Give windows some time to adjust network settings

View File

@@ -35,12 +35,14 @@
# This script installs Python $version.
# Python3 is required for building some qt modules.
param(
[Int32]$archVer=32,
[string]$install_path = "C:\Python36"
[Int32]$archVer,
[string]$sha1,
[string]$install_path,
[string]$version,
[bool]$setDefault=$false
)
. "$PSScriptRoot\helpers.ps1"
$version = "3.6.1"
$package = "C:\Windows\temp\python-$version.exe"
# check bit version
@@ -48,11 +50,9 @@ 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"
} else {
$externalUrl = "https://www.python.org/ftp/python/$version/python-$version.exe"
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/python-$version.exe"
$sha1 = "76c50b747237a0974126dd8b32ea036dd77b2ad1"
}
Write-Host "Fetching from URL..."
@@ -65,11 +65,19 @@ Remove-Item -Path $package
# 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"
if ($setDefault) {
Set-EnvironmentVariable "PYTHON3_32_PATH" "$install_path"
Set-EnvironmentVariable "PIP3_32_PATH" "$install_path\Scripts"
}
Set-EnvironmentVariable "PYTHON$version-32_PATH" "$install_path"
Set-EnvironmentVariable "PIP$version-32_PATH" "$install_path\Scripts"
} else {
Set-EnvironmentVariable "PYTHON3_PATH" "$install_path"
Set-EnvironmentVariable "PIP3_PATH" "$install_path\Scripts"
if ($setDefault) {
Set-EnvironmentVariable "PYTHON3_PATH" "$install_path"
Set-EnvironmentVariable "PIP3_PATH" "$install_path\Scripts"
}
Set-EnvironmentVariable "PYTHON$version-64_PATH" "$install_path"
Set-EnvironmentVariable "PIP$version-64_PATH" "$install_path\Scripts"
}
@@ -88,7 +96,13 @@ Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv wh
# Install all needed packages in a special wheel cache directory
$python3_wheel_dir="$install_path\python3-wheels"
Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args wheel --wheel-dir $python3_wheel_dir -r $PSScriptRoot\..\shared\requirements.txt"
Set-EnvironmentVariable "PYTHON3_WHEEL_CACHE" "$python3_wheel_dir"
Set-EnvironmentVariable "PYTHON3_WHEEL_CACHE-$version-$archVer" "$python3_wheel_dir"
# PYTHON3_WHEEL_CACHE is already in use so we should keep it pointing to 64 bit default
# wheel cache
if (($setDefault) -And ($archVer -eq 64)) {
Set-EnvironmentVariable "PYTHON3_WHEEL_CACHE" "$python3_wheel_dir"
}
# Install PyPDF2 for QSR documentation
Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install PyPDF2"

View File

@@ -1 +1,8 @@
. "$PSScriptRoot\..\common\windows\python3.ps1"
# Parameters:
# - Arch 32/64
# - installer sha1
# - install target dir
# - version
# - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false
. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "76c50b747237a0974126dd8b32ea036dd77b2ad1" "C:\Python36" "3.6.1" $true

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "C:\Python36_32"

View File

@@ -1 +1,12 @@
. "$PSScriptRoot\..\common\windows\python3.ps1" 64
# Parameters:
# - Arch 32/64
# - installer sha1
# - install target dir
# - version
# - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false
. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a8ac14ee5486547caf84abdf151be22d9d069c0a" "C:\Python38_64" "3.8.1"
. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "14ff2c2e5538b03a012cb4c9d519d970444ebd42" "C:\Python38_32" "3.8.1"
# default ones
. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "bf54252c4065b20f4a111cc39cf5215fb1edccff" "C:\Python36" "3.6.1" $true
. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "76c50b747237a0974126dd8b32ea036dd77b2ad1" "C:\Python36_32" "3.6.1" $true

View File

@@ -1 +1,8 @@
. "$PSScriptRoot\..\common\windows\python3.ps1"
# Parameters:
# - Arch 32/64
# - installer sha1
# - install target dir
# - version
# - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false
. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "76c50b747237a0974126dd8b32ea036dd77b2ad1" "C:\Python36" "3.6.1" $true

2
qt3d

Submodule qt3d updated: 5f83aa9113...dc26105a3a

2
qtbase

Submodule qtbase updated: de6e92e26a...e4961b35de

2
qtdoc

Submodule qtdoc updated: 64a0b3a31a...82cbe6d44f

2
qtqa

Submodule qtqa updated: 36a71f6d34...e623157fa9

Submodule qtscxml updated: a11be67255...38095de194

2
qtsvg

Submodule qtsvg updated: d439739e15...6b444e832d

Submodule qttools updated: d4342ab7e8...72744ac361