mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-21 15:38:15 +08:00
Compare commits
7 Commits
v6.5.6-lts
...
v6.5.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
19b7e91751 | ||
|
|
f504916373 | ||
|
|
9ed14c6e5b | ||
|
|
ef67ee6bf2 | ||
|
|
b7223e1020 | ||
|
|
aba066b01e | ||
|
|
fc39898816 |
82
.gitmodules
vendored
82
.gitmodules
vendored
@@ -1,40 +1,40 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative qtquick3d
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
@@ -47,7 +47,7 @@
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -55,7 +55,7 @@
|
||||
recommends = qtmultimedia qtshadertools qtwebengine
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -76,21 +76,21 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = preview
|
||||
[submodule "qtpositioning"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtpositioning
|
||||
url = ../qtpositioning.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -117,61 +117,61 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebchannel qttools qtpositioning
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
@@ -185,28 +185,28 @@
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
@@ -219,27 +219,27 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
@@ -252,80 +252,80 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtlanguageserver"]
|
||||
depends = qtbase
|
||||
path = qtlanguageserver
|
||||
url = ../qtlanguageserver.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = preview
|
||||
[submodule "qthttpserver"]
|
||||
depends = qtbase
|
||||
recommends = qtwebsockets
|
||||
path = qthttpserver
|
||||
url = ../qthttpserver.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = preview
|
||||
[submodule "qtquick3dphysics"]
|
||||
depends = qtbase qtdeclarative qtquick3d qtshadertools
|
||||
path = qtquick3dphysics
|
||||
url = ../qtquick3dphysics.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
[submodule "qtgrpc"]
|
||||
depends = qtbase
|
||||
path = qtgrpc
|
||||
url = ../qtgrpc.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = preview
|
||||
[submodule "qtquickeffectmaker"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquick3d
|
||||
path = qtquickeffectmaker
|
||||
url = ../qtquickeffectmaker.git
|
||||
branch = 6.5
|
||||
branch = 6.5.1
|
||||
status = addon
|
||||
|
||||
@@ -138,7 +138,6 @@ build_ffmpeg_android() {
|
||||
}
|
||||
|
||||
if [ "$os" == "linux" ]; then
|
||||
ffmpeg_config_options="$ffmpeg_config_options --enable-openssl"
|
||||
build_ffmpeg
|
||||
sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local"
|
||||
SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
|
||||
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: 1ba5993e00...7da3c72367
Submodule qt5compat updated: 6f248c7789...d751258b3a
Submodule qtactiveqt updated: 050f42df38...3d4eb3a0e7
2
qtbase
2
qtbase
Submodule qtbase updated: 1c7a8abe84...55aee86975
2
qtcharts
2
qtcharts
Submodule qtcharts updated: ba222ac3e0...b61f65dacd
2
qtcoap
2
qtcoap
Submodule qtcoap updated: 0db738e5f9...ec535750df
Submodule qtconnectivity updated: abdf854039...662abed3ac
Submodule qtdatavis3d updated: 7304deb4fc...46c0f385a3
Submodule qtdeclarative updated: b2e146691a...65651dc1d3
2
qtdoc
2
qtdoc
Submodule qtdoc updated: ff37fc1ff4...26943ca49c
2
qtgrpc
2
qtgrpc
Submodule qtgrpc updated: 69987e8584...94446d021a
Submodule qthttpserver updated: 21f1ebb921...98f869148f
Submodule qtimageformats updated: d08e76acb9...5fcfaeebf5
Submodule qtlanguageserver updated: d94cbf0857...cfa9af4cb2
Submodule qtlocation updated: 70969189ec...e84dd5b2b1
2
qtlottie
2
qtlottie
Submodule qtlottie updated: 2045748153...22da1b8332
2
qtmqtt
2
qtmqtt
Submodule qtmqtt updated: dd6ad2198a...4fe95ce910
Submodule qtmultimedia updated: 5cacbebb31...9aeba9885b
Submodule qtnetworkauth updated: c038139b87...67df9b2166
2
qtopcua
2
qtopcua
Submodule qtopcua updated: b2125d622f...65b1bf9d2c
Submodule qtpositioning updated: e63e52aca7...9e27d2e7a6
2
qtqa
2
qtqa
Submodule qtqa updated: 0c48960efb...c7a2fff1e2
Submodule qtquick3d updated: 30284a215c...c3fcfc65a3
Submodule qtquick3dphysics updated: b04c7eb2bc...216c4cd8ae
Submodule qtquickeffectmaker updated: aa28d53b93...1f26aafb7c
Submodule qtquicktimeline updated: 3a9dabef71...8e7a3187fe
Submodule qtremoteobjects updated: 570ea19a89...e800101fe4
Submodule qtrepotools updated: 5721f2aceb...9d46982641
2
qtscxml
2
qtscxml
Submodule qtscxml updated: 730eed4610...0157667141
Submodule qtsensors updated: 554e316ec0...e9a2467376
Submodule qtserialbus updated: bedb1239f2...c49440f30d
Submodule qtserialport updated: 06887a3ffa...957a2fc15c
Submodule qtshadertools updated: c0fdcebd2c...46e8aadf1c
2
qtspeech
2
qtspeech
Submodule qtspeech updated: fb05e27811...07d9bdf2a4
2
qtsvg
2
qtsvg
Submodule qtsvg updated: f59f7efa39...bc7b39eb4e
2
qttools
2
qttools
Submodule qttools updated: 638eb559a8...3b594e8043
Submodule qttranslations updated: 1b2f828f9f...02880e5b4a
Submodule qtvirtualkeyboard updated: d686ee2b02...84122509d1
Submodule qtwayland updated: 2d65b58187...3e7d12ffa6
Submodule qtwebchannel updated: 43db6ae7e2...d1a2eefe2d
Submodule qtwebengine updated: ae8cf23056...735d2f75d7
Submodule qtwebsockets updated: 4c072f0544...ec6015ec6f
Submodule qtwebview updated: 3d6a24ca93...9352b7fa3c
Reference in New Issue
Block a user