mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-25 17:36:13 +08:00
Compare commits
12 Commits
6.2.4
...
v6.2.0-rc2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ab311180ba | ||
|
|
893a7d6d98 | ||
|
|
0d2488bd32 | ||
|
|
efb86886e1 | ||
|
|
6e42fc3e0a | ||
|
|
fc0466cd53 | ||
|
|
d14203d441 | ||
|
|
d3859c14ee | ||
|
|
c9408c8172 | ||
|
|
c5d8723bf2 | ||
|
|
4b4264c7d5 | ||
|
|
e5495d93f6 |
78
.gitmodules
vendored
78
.gitmodules
vendored
@@ -1,53 +1,53 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -55,7 +55,7 @@
|
||||
recommends = qtmultimedia
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -76,14 +76,14 @@
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -110,183 +110,183 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = ignore
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = ignore
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
|
||||
@@ -42,9 +42,9 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
urlToolchainEs7="http://ci-files01-hki.ci.local/input/integrity/integrity_toolchain_es7.zip"
|
||||
urlToolchainEs7="http://ci-files01-hki.ci.local/input/integrity/integrity_toolchain_es7_patched.zip"
|
||||
urlToolchainAddons="http://ci-files01-hki.ci.local/input/integrity/integrity_toolchain_addons.zip"
|
||||
SHA1_toolchainEs7="3c1edba781aa518e53e962cdb5fc5483aaa4991b"
|
||||
SHA1_toolchainEs7="e890fe332a81f8345fed3dff89b30019d9989765"
|
||||
SHA1_toolchainAddons="1eb838edca4edaa3d9076b5ce4aea6409ffaa022"
|
||||
targetFolder="$HOME"
|
||||
appPrefix=""
|
||||
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: 1d55367db3...8be6ce53fa
Submodule qt5compat updated: 60b89dc631...72fb08665d
Submodule qtactiveqt updated: 7eed7bfc82...e209d851c8
2
qtbase
2
qtbase
Submodule qtbase updated: 7369c31ca1...28792da875
2
qtcharts
2
qtcharts
Submodule qtcharts updated: 7e077bf043...4a4ee7e9b8
2
qtcoap
2
qtcoap
Submodule qtcoap updated: 3f68e1d5f3...8643812597
Submodule qtconnectivity updated: a510fc1950...73130793dd
Submodule qtdatavis3d updated: dc0a280f4b...9600ec85f4
Submodule qtdeclarative updated: 215dea1bfc...21138f5117
2
qtdoc
2
qtdoc
Submodule qtdoc updated: 8f054fd3f5...d348d8b4df
Submodule qtimageformats updated: bdfb6aa2ae...ca20af762a
Submodule qtlocation updated: ee1645e9f8...32e3f9fa4c
2
qtlottie
2
qtlottie
Submodule qtlottie updated: 03697b9c56...922cdf575d
2
qtmqtt
2
qtmqtt
Submodule qtmqtt updated: 1c9afc958a...e521659c32
Submodule qtmultimedia updated: 674c93e867...e84b51b28e
Submodule qtnetworkauth updated: 97cc53a449...0e238a0371
2
qtopcua
2
qtopcua
Submodule qtopcua updated: 0afabce65c...387af41771
2
qtqa
2
qtqa
Submodule qtqa updated: e77b736871...cc06034568
Submodule qtquick3d updated: 892041cc55...4fc1f5d168
Submodule qtquicktimeline updated: a71338db5d...4ff15889d3
Submodule qtremoteobjects updated: a712f2bf34...97d81e9a3c
2
qtscxml
2
qtscxml
Submodule qtscxml updated: a926bf1de9...2ced45b4fc
Submodule qtsensors updated: 48c0f094f5...bdaaaddcdc
Submodule qtserialbus updated: aae4b24daf...cdac377d82
Submodule qtserialport updated: 27cb0a6261...7e01680443
Submodule qtshadertools updated: 5b6d002fa8...db72d0122a
2
qtsvg
2
qtsvg
Submodule qtsvg updated: e1db462359...31d8216a2d
2
qttools
2
qttools
Submodule qttools updated: d9f5cc9c22...2b8d921ef1
Submodule qttranslations updated: c3b1439913...ccd3ec8605
Submodule qtvirtualkeyboard updated: 8bb9aed34f...44cf2c7aff
Submodule qtwayland updated: c424a5e663...71dcd976f0
Submodule qtwebchannel updated: 5b9cb844ce...9b3316fe32
Submodule qtwebengine updated: 700e84888e...983b9aca45
Submodule qtwebsockets updated: 6a58506641...f03870f483
Submodule qtwebview updated: 265dbdda08...547c0960ac
Reference in New Issue
Block a user