mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-18 10:09:15 +08:00
Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
20ed14d217 | ||
|
|
627936f604 | ||
|
|
408ef0edfe | ||
|
|
3bb48b163f | ||
|
|
5fca48ecbb | ||
|
|
ba53aa4e19 | ||
|
|
32abae1703 | ||
|
|
b8a7bb1684 | ||
|
|
a3f91a362c |
48
.gitmodules
vendored
48
.gitmodules
vendored
@@ -1,26 +1,26 @@
|
|||||||
[submodule "qtbase"]
|
[submodule "qtbase"]
|
||||||
path = qtbase
|
path = qtbase
|
||||||
url = ../qtbase.git
|
url = ../qtbase.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = essential
|
status = essential
|
||||||
[submodule "qtsvg"]
|
[submodule "qtsvg"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtsvg
|
path = qtsvg
|
||||||
url = ../qtsvg.git
|
url = ../qtsvg.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtdeclarative"]
|
[submodule "qtdeclarative"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtsvg
|
recommends = qtsvg
|
||||||
path = qtdeclarative
|
path = qtdeclarative
|
||||||
url = ../qtdeclarative.git
|
url = ../qtdeclarative.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = essential
|
status = essential
|
||||||
[submodule "qtactiveqt"]
|
[submodule "qtactiveqt"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtactiveqt
|
path = qtactiveqt
|
||||||
url = ../qtactiveqt.git
|
url = ../qtactiveqt.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtmultimedia"]
|
[submodule "qtmultimedia"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
recommends = qtdeclarative qtactiveqt
|
recommends = qtdeclarative qtactiveqt
|
||||||
path = qttools
|
path = qttools
|
||||||
url = ../qttools.git
|
url = ../qttools.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = essential
|
status = essential
|
||||||
[submodule "qtxmlpatterns"]
|
[submodule "qtxmlpatterns"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
@@ -47,7 +47,7 @@
|
|||||||
depends = qttools
|
depends = qttools
|
||||||
path = qttranslations
|
path = qttranslations
|
||||||
url = ../qttranslations.git
|
url = ../qttranslations.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = essential
|
status = essential
|
||||||
priority = 30
|
priority = 30
|
||||||
[submodule "qtdoc"]
|
[submodule "qtdoc"]
|
||||||
@@ -55,7 +55,7 @@
|
|||||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||||
path = qtdoc
|
path = qtdoc
|
||||||
url = ../qtdoc.git
|
url = ../qtdoc.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = essential
|
status = essential
|
||||||
priority = 40
|
priority = 40
|
||||||
[submodule "qtrepotools"]
|
[submodule "qtrepotools"]
|
||||||
@@ -117,20 +117,20 @@
|
|||||||
recommends = qtdeclarative
|
recommends = qtdeclarative
|
||||||
path = qtwayland
|
path = qtwayland
|
||||||
url = ../qtwayland.git
|
url = ../qtwayland.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qt3d"]
|
[submodule "qt3d"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative qtshadertools
|
recommends = qtdeclarative qtshadertools
|
||||||
path = qt3d
|
path = qt3d
|
||||||
url = ../qt3d.git
|
url = ../qt3d.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtimageformats"]
|
[submodule "qtimageformats"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtimageformats
|
path = qtimageformats
|
||||||
url = ../qtimageformats.git
|
url = ../qtimageformats.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtgraphicaleffects"]
|
[submodule "qtgraphicaleffects"]
|
||||||
depends = qtdeclarative
|
depends = qtdeclarative
|
||||||
@@ -223,7 +223,7 @@
|
|||||||
recommends = qtimageformats qtgraphicaleffects
|
recommends = qtimageformats qtgraphicaleffects
|
||||||
path = qtquickcontrols2
|
path = qtquickcontrols2
|
||||||
url = ../qtquickcontrols2.git
|
url = ../qtquickcontrols2.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = essential
|
status = essential
|
||||||
[submodule "qtpurchasing"]
|
[submodule "qtpurchasing"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
@@ -237,21 +237,21 @@
|
|||||||
recommends = qtdeclarative qtmultimedia
|
recommends = qtdeclarative qtmultimedia
|
||||||
path = qtcharts
|
path = qtcharts
|
||||||
url = ../qtcharts.git
|
url = ../qtcharts.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtdatavis3d"]
|
[submodule "qtdatavis3d"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative qtmultimedia
|
recommends = qtdeclarative qtmultimedia
|
||||||
path = qtdatavis3d
|
path = qtdatavis3d
|
||||||
url = ../qtdatavis3d.git
|
url = ../qtdatavis3d.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtvirtualkeyboard"]
|
[submodule "qtvirtualkeyboard"]
|
||||||
depends = qtbase qtdeclarative qtsvg
|
depends = qtbase qtdeclarative qtsvg
|
||||||
recommends = qtmultimedia qtquickcontrols
|
recommends = qtmultimedia qtquickcontrols
|
||||||
path = qtvirtualkeyboard
|
path = qtvirtualkeyboard
|
||||||
url = ../qtvirtualkeyboard.git
|
url = ../qtvirtualkeyboard.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtgamepad"]
|
[submodule "qtgamepad"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
@@ -264,7 +264,7 @@
|
|||||||
depends = qtbase qtdeclarative
|
depends = qtbase qtdeclarative
|
||||||
path = qtscxml
|
path = qtscxml
|
||||||
url = ../qtscxml.git
|
url = ../qtscxml.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtspeech"]
|
[submodule "qtspeech"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
@@ -277,7 +277,7 @@
|
|||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtnetworkauth
|
path = qtnetworkauth
|
||||||
url = ../qtnetworkauth.git
|
url = ../qtnetworkauth.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtremoteobjects"]
|
[submodule "qtremoteobjects"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
@@ -297,47 +297,47 @@
|
|||||||
depends = qtbase qtdeclarative
|
depends = qtbase qtdeclarative
|
||||||
path = qtlottie
|
path = qtlottie
|
||||||
url = ../qtlottie.git
|
url = ../qtlottie.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtquicktimeline"]
|
[submodule "qtquicktimeline"]
|
||||||
depends = qtbase qtdeclarative
|
depends = qtbase qtdeclarative
|
||||||
path = qtquicktimeline
|
path = qtquicktimeline
|
||||||
url = ../qtquicktimeline
|
url = ../qtquicktimeline
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtquick3d"]
|
[submodule "qtquick3d"]
|
||||||
depends = qtbase qtdeclarative qtshadertools
|
depends = qtbase qtdeclarative qtshadertools
|
||||||
path = qtquick3d
|
path = qtquick3d
|
||||||
url = ../qtquick3d.git
|
url = ../qtquick3d.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtshadertools"]
|
[submodule "qtshadertools"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtshadertools
|
path = qtshadertools
|
||||||
url = ../qtshadertools.git
|
url = ../qtshadertools.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qt5compat"]
|
[submodule "qt5compat"]
|
||||||
depends = qtbase qtdeclarative
|
depends = qtbase qtdeclarative
|
||||||
path = qt5compat
|
path = qt5compat
|
||||||
url = ../qt5compat.git
|
url = ../qt5compat.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = deprecated
|
status = deprecated
|
||||||
[submodule "qtcoap"]
|
[submodule "qtcoap"]
|
||||||
depends = qtbase qttools
|
depends = qtbase qttools
|
||||||
path = qtcoap
|
path = qtcoap
|
||||||
url = ../qtcoap.git
|
url = ../qtcoap.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtmqtt"]
|
[submodule "qtmqtt"]
|
||||||
depends = qtbase qtdeclarative qttools
|
depends = qtbase qtdeclarative qttools
|
||||||
path = qtmqtt
|
path = qtmqtt
|
||||||
url = ../qtmqtt.git
|
url = ../qtmqtt.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtopcua"]
|
[submodule "qtopcua"]
|
||||||
depends = qtbase qtdeclarative qtquickcontrols2 qttools
|
depends = qtbase qtdeclarative qtquickcontrols2 qttools
|
||||||
path = qtopcua
|
path = qtopcua
|
||||||
url = ../qtopcua.git
|
url = ../qtopcua.git
|
||||||
branch = 6.1
|
branch = 6.1.2
|
||||||
status = addon
|
status = addon
|
||||||
|
|||||||
@@ -71,9 +71,9 @@ cd "$opensslHome"
|
|||||||
PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
|
PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
|
||||||
PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
|
PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
|
||||||
'
|
'
|
||||||
prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_k_for-android-ndk-21.tar.gz"
|
prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_g_for-android-ndk-21.tar.gz"
|
||||||
targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
|
targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
|
||||||
sha="8c4db1eb8460d749c998a0e033b3939123cbc5ac"
|
sha="2998e1a3bc9aa4bc7475d1be270db9f4109fca00"
|
||||||
DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
|
DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
|
||||||
tar -xzf "$targetFile" -C "${HOME}"
|
tar -xzf "$targetFile" -C "${HOME}"
|
||||||
|
|
||||||
|
|||||||
2
qt3d
2
qt3d
Submodule qt3d updated: dc9af53fb6...aa0e777668
Submodule qt5compat updated: 8bfe48a3f5...03302321ac
Submodule qtactiveqt updated: 4d8cd0daf7...a0d3e45088
2
qtbase
2
qtbase
Submodule qtbase updated: ae1921b0ea...4dcedb8ca4
2
qtcharts
2
qtcharts
Submodule qtcharts updated: 6643e1b588...33316596d2
2
qtcoap
2
qtcoap
Submodule qtcoap updated: 4766482bcb...4074e4a377
Submodule qtdatavis3d updated: 34ee66db19...29ec6342dd
Submodule qtdeclarative updated: feb076d23e...c450bddeba
2
qtdoc
2
qtdoc
Submodule qtdoc updated: 35162e0a03...3b3f5d5f3b
Submodule qtimageformats updated: f9e0924701...294ea163fd
2
qtlottie
2
qtlottie
Submodule qtlottie updated: 68e7c4bb83...6259a405c1
2
qtmqtt
2
qtmqtt
Submodule qtmqtt updated: 74450afc27...0bc4b3f013
Submodule qtnetworkauth updated: 3152cf5cc6...ccad8f5cd0
2
qtopcua
2
qtopcua
Submodule qtopcua updated: a2410032e5...4d28a338ba
2
qtqa
2
qtqa
Submodule qtqa updated: 1b1510d612...143770c5d6
Submodule qtquick3d updated: 2293b371db...3eca5f4955
Submodule qtquickcontrols2 updated: 131230a555...5ae33c6ad2
Submodule qtquicktimeline updated: ab8c067bad...6ade59c3b5
Submodule qtrepotools updated: 47b15af0da...e85982c40f
2
qtscxml
2
qtscxml
Submodule qtscxml updated: 705e57a116...fb6b7d4dc0
Submodule qtshadertools updated: 322f0f8107...771b613bd9
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 2dca6bc761...4fed9a17ed
2
qttools
2
qttools
Submodule qttools updated: 20d0f61e4a...9cfbb98844
Submodule qttranslations updated: 0155f8957f...644a26b480
Submodule qtvirtualkeyboard updated: 3d5d61ee5d...524720e381
Submodule qtwayland updated: 1ad265a63f...8662561308
Reference in New Issue
Block a user