Compare commits

..

6 Commits
6.1 ... v6.1.2

Author SHA1 Message Date
Qt Submodule Update Bot
3bb48b163f Update submodules on '6.1.2' in qt/qt5
Change-Id: I08ef28a18adc3f7b7c02dc80cba6c990909e0636
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-28 13:53:05 +03:00
Qt Submodule Update Bot
5fca48ecbb Update submodules on '6.1.2' in qt/qt5
Change-Id: I4a9d0ec894c7df8317b42e446c7711dabe5b58cb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-22 09:34:36 +03:00
Qt Submodule Update Bot
ba53aa4e19 Update submodules on '6.1.2' in qt/qt5
Change-Id: I2193724c8541e36e97aaa9645d7eb3a565f7ef46
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-22 06:53:20 +03:00
Qt Submodule Update Bot
32abae1703 Update submodules on '6.1.2' in qt/qt5
Change-Id: Ie6e68e1d3f9936d79be2ca856c29cb82bc79f8c2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-18 20:14:43 +03:00
Jani Heikkinen
b8a7bb1684 Merge remote-tracking branch 'origin/6.1' into 6.1.2
Change-Id: I636cde20f785a5dc3b0c6d32416de469d4e7f1ff
2021-06-18 09:34:49 +03:00
Jani Heikkinen
a3f91a362c Adjust submodule branches
Change-Id: I1c9976b864b980a607564225ec64f9d0311aa32e
2021-06-18 07:55:38 +03:00
28 changed files with 52 additions and 52 deletions

48
.gitmodules vendored
View File

@@ -1,26 +1,26 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 6.1
branch = 6.1.2
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 6.1
branch = 6.1.2
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
branch = 6.1
branch = 6.1.2
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 6.1
branch = 6.1.2
status = addon
[submodule "qtmultimedia"]
depends = qtbase
@@ -34,7 +34,7 @@
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
branch = 6.1
branch = 6.1.2
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
@@ -47,7 +47,7 @@
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 6.1
branch = 6.1.2
status = essential
priority = 30
[submodule "qtdoc"]
@@ -55,7 +55,7 @@
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
path = qtdoc
url = ../qtdoc.git
branch = 6.1
branch = 6.1.2
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -117,20 +117,20 @@
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 6.1
branch = 6.1.2
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtshadertools
path = qt3d
url = ../qt3d.git
branch = 6.1
branch = 6.1.2
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = 6.1
branch = 6.1.2
status = addon
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
@@ -223,7 +223,7 @@
recommends = qtimageformats qtgraphicaleffects
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = 6.1
branch = 6.1.2
status = essential
[submodule "qtpurchasing"]
depends = qtbase
@@ -237,21 +237,21 @@
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = 6.1
branch = 6.1.2
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = 6.1
branch = 6.1.2
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 6.1
branch = 6.1.2
status = addon
[submodule "qtgamepad"]
depends = qtbase
@@ -264,7 +264,7 @@
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
branch = 6.1
branch = 6.1.2
status = addon
[submodule "qtspeech"]
depends = qtbase
@@ -277,7 +277,7 @@
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = 6.1
branch = 6.1.2
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
@@ -297,47 +297,47 @@
depends = qtbase qtdeclarative
path = qtlottie
url = ../qtlottie.git
branch = 6.1
branch = 6.1.2
status = addon
[submodule "qtquicktimeline"]
depends = qtbase qtdeclarative
path = qtquicktimeline
url = ../qtquicktimeline
branch = 6.1
branch = 6.1.2
status = addon
[submodule "qtquick3d"]
depends = qtbase qtdeclarative qtshadertools
path = qtquick3d
url = ../qtquick3d.git
branch = 6.1
branch = 6.1.2
status = addon
[submodule "qtshadertools"]
depends = qtbase
path = qtshadertools
url = ../qtshadertools.git
branch = 6.1
branch = 6.1.2
status = addon
[submodule "qt5compat"]
depends = qtbase qtdeclarative
path = qt5compat
url = ../qt5compat.git
branch = 6.1
branch = 6.1.2
status = deprecated
[submodule "qtcoap"]
depends = qtbase qttools
path = qtcoap
url = ../qtcoap.git
branch = 6.1
branch = 6.1.2
status = addon
[submodule "qtmqtt"]
depends = qtbase qtdeclarative qttools
path = qtmqtt
url = ../qtmqtt.git
branch = 6.1
branch = 6.1.2
status = addon
[submodule "qtopcua"]
depends = qtbase qtdeclarative qtquickcontrols2 qttools
path = qtopcua
url = ../qtopcua.git
branch = 6.1
branch = 6.1.2
status = addon

View File

@@ -71,9 +71,9 @@ cd "$opensslHome"
PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
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"
sha="8c4db1eb8460d749c998a0e033b3939123cbc5ac"
sha="2998e1a3bc9aa4bc7475d1be270db9f4109fca00"
DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
tar -xzf "$targetFile" -C "${HOME}"

2
qt3d

Submodule qt3d updated: dc9af53fb6...aa0e777668

2
qtbase

Submodule qtbase updated: ae1921b0ea...4dcedb8ca4

2
qtcoap

Submodule qtcoap updated: 4766482bcb...4074e4a377

2
qtdoc

Submodule qtdoc updated: 35162e0a03...3b3f5d5f3b

2
qtmqtt

Submodule qtmqtt updated: 74450afc27...0bc4b3f013

Submodule qtopcua updated: a2410032e5...4d28a338ba

2
qtqa

Submodule qtqa updated: 1b1510d612...9a77f7719c

Submodule qtscxml updated: 705e57a116...fb6b7d4dc0

2
qtsvg

Submodule qtsvg updated: 2dca6bc761...4fed9a17ed

Submodule qttools updated: 20d0f61e4a...9cfbb98844