mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-21 15:38:15 +08:00
Compare commits
26 Commits
v6.0.0-bet
...
v5.15.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dd11f01de7 | ||
|
|
b916e0db22 | ||
|
|
39d852d05a | ||
|
|
0d62fbdeb8 | ||
|
|
51e21dcadd | ||
|
|
f524b6a79d | ||
|
|
e5488354ca | ||
|
|
27ffd5c6b2 | ||
|
|
b2ca6cf26b | ||
|
|
49825be2dc | ||
|
|
8066f8ef9f | ||
|
|
a8f008d5a5 | ||
|
|
8c7592b5c4 | ||
|
|
c129f9983d | ||
|
|
44fe19f004 | ||
|
|
b6363e91e9 | ||
|
|
ac1bc46838 | ||
|
|
9972ae9fb6 | ||
|
|
93a2636e0f | ||
|
|
5442f9a23a | ||
|
|
7339218edd | ||
|
|
73765a6885 | ||
|
|
093f748d82 | ||
|
|
f399972a0d | ||
|
|
192bd350fb | ||
|
|
7585da561e |
84
.gitmodules
vendored
84
.gitmodules
vendored
@@ -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
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
Disable-NetAdapterLso Ethernet
|
||||
Start-Sleep -s 15 # Give windows some time to adjust network settings
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "C:\Python36_32"
|
||||
@@ -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
|
||||
|
||||
@@ -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
2
qt3d
Submodule qt3d updated: 5f83aa9113...dc26105a3a
Submodule qtactiveqt updated: cddd08a9ed...560c588e59
Submodule qtandroidextras updated: 7368404020...3621223c1f
2
qtbase
2
qtbase
Submodule qtbase updated: de6e92e26a...e4961b35de
2
qtcharts
2
qtcharts
Submodule qtcharts updated: b1edcbc8b0...68a2a43989
Submodule qtconnectivity updated: be75143e7d...6fe502ad84
Submodule qtdatavis3d updated: 8ea21240c3...0980126449
Submodule qtdeclarative updated: ad47d70e22...02c499996b
2
qtdoc
2
qtdoc
Submodule qtdoc updated: 64a0b3a31a...82cbe6d44f
Submodule qtgamepad updated: f1e9844fa7...7bf40625ab
Submodule qtgraphicaleffects updated: 83e9a15a52...c343d7746b
Submodule qtimageformats updated: 1a790ba615...2cacdd5d5c
Submodule qtlocation updated: e73246b0e5...bae290d25a
2
qtlottie
2
qtlottie
Submodule qtlottie updated: 43c7e0a05f...2245b587f1
Submodule qtmacextras updated: 061b6abfc2...3a2179850f
Submodule qtmultimedia updated: 8337692ea3...73d9affb0c
Submodule qtnetworkauth updated: 9f6f71d7b1...eacb61f5b1
Submodule qtpurchasing updated: ac5a9b9615...cf85bd1d88
2
qtqa
2
qtqa
Submodule qtqa updated: 36a71f6d34...e623157fa9
Submodule qtquick3d updated: e133dec427...c2201f055e
Submodule qtquickcontrols updated: e5fb9e4cea...e22f5c4cd8
Submodule qtquickcontrols2 updated: f66d6116b0...c0daab494a
Submodule qtquicktimeline updated: e993bd51b8...32d7031e87
Submodule qtremoteobjects updated: d4957cd786...d08c7960de
Submodule qtrepotools updated: 050705f615...9207982f37
2
qtscript
2
qtscript
Submodule qtscript updated: 0f6ea35152...d2f926751d
2
qtscxml
2
qtscxml
Submodule qtscxml updated: a11be67255...38095de194
Submodule qtsensors updated: be24a7a43c...76fb972f60
Submodule qtserialbus updated: c12af88323...289fff1f7f
Submodule qtserialport updated: 49335de3e7...6f5fa73a35
2
qtspeech
2
qtspeech
Submodule qtspeech updated: 919fabda13...f4601353aa
2
qtsvg
2
qtsvg
Submodule qtsvg updated: d439739e15...6b444e832d
2
qttools
2
qttools
Submodule qttools updated: d4342ab7e8...72744ac361
Submodule qttranslations updated: ae7c48d054...ec3a7a623a
Submodule qtvirtualkeyboard updated: a5442ee7e4...ae04a778c8
Submodule qtwayland updated: eaeb21284a...c25f8b8fa4
Submodule qtwebchannel updated: 3342da9089...5bab22c141
Submodule qtwebengine updated: 027cce270a...9e4d1eb45d
Submodule qtwebglplugin updated: 5488f0731e...835b594bda
Submodule qtwebsockets updated: 34010e6497...9a0dd9a7b7
Submodule qtwebview updated: 1b514c3b7d...93bdca425b
Submodule qtwinextras updated: b8d402e143...922750e68d
Submodule qtx11extras updated: 17a9d40a3e...afa3ad1c1c
Submodule qtxmlpatterns updated: 0c04a447ca...c4d24e467d
Reference in New Issue
Block a user