mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-05 06:26:50 +08:00
Compare commits
3 Commits
v6.3.2
...
v6.3.0-rc1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
28fa31c441 | ||
|
|
686481f48c | ||
|
|
4ec029b83f |
82
.gitmodules
vendored
82
.gitmodules
vendored
@@ -1,53 +1,53 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -55,7 +55,7 @@
|
||||
recommends = qtmultimedia
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -76,21 +76,21 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = ignore
|
||||
[submodule "qtpositioning"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtpositioning
|
||||
url = ../qtpositioning.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -117,189 +117,189 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebchannel qttools qtpositioning
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = ignore
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = ignore
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtlanguageserver"]
|
||||
depends = qtbase
|
||||
path = qtlanguageserver
|
||||
url = ../qtlanguageserver.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = preview
|
||||
|
||||
@@ -54,11 +54,11 @@ if (Is64BitWinHost) {
|
||||
$version = "1.1.1m"
|
||||
$ndk_version = "r22b"
|
||||
$zip = Get-DownloadLocation ("openssl-$version.tar.gz")
|
||||
$prebuilt_zip = Get-DownloadLocation ("prebuilt-openssl-${version}-for-android-ndk-${ndk_version}-windows.zip")
|
||||
$sha1 = "39d424c4411e45f1570073d7a71b1830b96007ca"
|
||||
$prebuilt_sha1 = "860a7e675bf177e1d929d7594ef4efcf07838327"
|
||||
$prebuilt_zip = Get-DownloadLocation ("prebuilt-openssl-${version}-fixes-ndk_root-windows.zip")
|
||||
$sha1 = "c9638d25b9709eda1ac52591c0993af52d6d1206"
|
||||
$prebuilt_sha1 = "2bf5354b2264ed80e85fea3705ba434a38fe563e"
|
||||
$destination = "C:\Utils\openssl-android-master"
|
||||
$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\prebuilt-openssl-${version}-for-android-ndk-${ndk_version}-windows.zip"
|
||||
$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\prebuilt-openssl-${version}-fixes-ndk_root-windows.zip"
|
||||
|
||||
# msys unix style paths
|
||||
$ndkPath = "/c/Utils/Android/android-ndk-${ndk_version}"
|
||||
@@ -70,7 +70,8 @@ if ((Test-Path $prebuilt_url)) {
|
||||
Extract-7Zip $prebuilt_zip C:\Utils
|
||||
Remove $prebuilt_zip
|
||||
} else {
|
||||
Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
|
||||
# openssl-${version}_fixes-ndk_root.tar.gz package includes fixes from https://github.com/openssl/openssl/pull/17322 and string ANDROID_NDK_HOME is replaced with ANDROID_NDK_ROOT in Configurations/15-android.conf
|
||||
Download \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${version}_fixes-ndk_root.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${version}_fixes-ndk_root.tar.gz $zip
|
||||
Verify-Checksum $zip $sha1
|
||||
|
||||
Extract-7Zip $zip C:\Utils\tmp
|
||||
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: f542f21d09...f83c75b25d
Submodule qt5compat updated: a74935225f...db397b3046
Submodule qtactiveqt updated: a64f18d28c...6ab01380c2
2
qtbase
2
qtbase
Submodule qtbase updated: 30855574ea...136407e3eb
2
qtcharts
2
qtcharts
Submodule qtcharts updated: 3a34aa30a6...1ce1d3cd1a
2
qtcoap
2
qtcoap
Submodule qtcoap updated: 6ba5c48dd4...50fc1563ba
Submodule qtconnectivity updated: 8be506da1a...5cbefeb81a
Submodule qtdatavis3d updated: 4ff94dd019...d4b7073bd3
Submodule qtdeclarative updated: 29352826c6...fb8fc5ea31
2
qtdoc
2
qtdoc
Submodule qtdoc updated: d727642f09...794831cc94
Submodule qtimageformats updated: 4b3c7f3a5b...54f88cfd9c
Submodule qtlanguageserver updated: 2340f67934...9e52a3bcdc
2
qtlottie
2
qtlottie
Submodule qtlottie updated: 24b951631c...68caab219d
2
qtmqtt
2
qtmqtt
Submodule qtmqtt updated: 8996e55967...b58fab105a
Submodule qtmultimedia updated: 9267775651...9fe3824858
Submodule qtnetworkauth updated: 5d245ffa67...d87a4ab603
2
qtopcua
2
qtopcua
Submodule qtopcua updated: 91a0dbb1b2...98f2e03163
Submodule qtpositioning updated: 440c917f64...9631114eff
2
qtqa
2
qtqa
Submodule qtqa updated: da177b824c...fe72232e88
Submodule qtquick3d updated: 00e5182d03...fbfab83568
Submodule qtquicktimeline updated: 190513fdfd...52af42f901
Submodule qtremoteobjects updated: a7966fbd17...2d7d3d3b5f
2
qtscxml
2
qtscxml
Submodule qtscxml updated: 84fbe9e1c9...da0dc6b526
Submodule qtsensors updated: 4802e93c54...1d4e4588bd
Submodule qtserialbus updated: 193c6a06b8...de31ab8745
Submodule qtserialport updated: 8419cfc227...1a37635613
Submodule qtshadertools updated: f87443c81b...b34e3b82bc
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 41d4a456a1...068d38969c
2
qttools
2
qttools
Submodule qttools updated: c12a3030f6...4927053724
Submodule qttranslations updated: 9d4da5fb9c...cd8f8f2fff
Submodule qtvirtualkeyboard updated: 864b552d36...a7d91e6ca6
Submodule qtwayland updated: 2bd5efb450...543a8684e7
Submodule qtwebchannel updated: b2f299eb20...127188f98d
Submodule qtwebengine updated: 2e9ce50d76...a42e9ff235
Submodule qtwebsockets updated: b0d1cae59e...7d7ba9536a
Submodule qtwebview updated: 960117258f...70114771be
Reference in New Issue
Block a user