Compare commits

...

15 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
b8e587b74c Update submodules on '6.2.0' in qt/qt5
Change-Id: I7a7252751d9cc351a5d78ed94af5154e861a5fd8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-25 17:35:05 +03:00
Qt Submodule Update Bot
fac86c3865 Update submodules on '6.2.0' in qt/qt5
Change-Id: Ie8e2d877d5ca65cc31aaba113f20701e0e13aabb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-25 06:06:18 +03:00
Qt Submodule Update Bot
a23c44f7a3 Update submodules on '6.2.0' in qt/qt5
Change-Id: Ib03cbd4d8823223b166114ea2e487ddbd73ee9f2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-23 06:23:28 +03:00
Qt Submodule Update Bot
ab311180ba Update submodules on '6.2.0' in qt/qt5
Change-Id: I24e678b4a4eb628c3101502ce4d3a32a17e78625
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-21 22:00:41 +03:00
Qt Submodule Update Bot
893a7d6d98 Update submodules on '6.2.0' in qt/qt5
Change-Id: Idd65c0ed9da1e8a162c5b6a9516b2dfcca9a0128
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-21 06:50:15 +03:00
Qt Submodule Update Bot
0d2488bd32 Update submodules on '6.2.0' in qt/qt5
Change-Id: Id72a07fc3804bbb915367abff486b1f9c7233949
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-19 20:40:05 +03:00
Qt Submodule Update Bot
efb86886e1 Update submodules on '6.2.0' in qt/qt5
Change-Id: Ic3c9c12f9262c0c5a0bf7d09149146d4a2e6d6b1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-19 09:20:03 +03:00
Qt Submodule Update Bot
6e42fc3e0a Update submodules on '6.2.0' in qt/qt5
Change-Id: I3c8b4abbff31fa7f595da56e0238e3a8610431d4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-14 08:14:44 +03:00
Qt Submodule Update Bot
fc0466cd53 Update submodules on '6.2.0' in qt/qt5
Change-Id: Id7f68d2fd346ff4a483879f7e2f2e0f6dfe160ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-13 14:11:47 +03:00
Jani Heikkinen
d14203d441 Fix M2M module branches
Change-Id: Ib5f30b9b96af1bafba72775c3d8c55f898187b51
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-09-13 10:17:27 +03:00
Jani Heikkinen
d3859c14ee Update submodules on '6.2.0' in qt/qt5
Change-Id: Ic1423e1f6582fa18c4cef70dad89fd9a9efa280f
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2021-09-13 07:10:06 +03:00
Qt Submodule Update Bot
c9408c8172 Update submodules on '6.2.0' in qt/qt5
Change-Id: I2919dfcb783d4eef8a9b51527ec741fa8a2f6d54
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-12 02:40:01 +03:00
Qt Submodule Update Bot
c5d8723bf2 Update submodules on '6.2.0' in qt/qt5
Change-Id: Ic2db19708421b63d2f12f152bbb397fce1887406
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-11 04:39:25 +03:00
Heikki Halmet
4b4264c7d5 Provisioning: Update the Integrity toolchain version
Task-number: QTQAINFRA-3555
Change-Id: I2a1f25024862b0b96bb7675376520d2e3a679d0b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit f320433979)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-09-08 09:26:55 +03:00
Jani Heikkinen
e5495d93f6 Adjust submodule branches
Change-Id: I57ff0bdb21eaa15434f223d1481be9dc862b841f
2021-09-08 08:00:58 +03:00
37 changed files with 76 additions and 76 deletions

78
.gitmodules vendored
View File

@@ -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

View File

@@ -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

Submodule qt3d updated: 1d55367db3...e35a5676f7

2
qtbase

Submodule qtbase updated: 7369c31ca1...cc60cf83db

2
qtcoap

Submodule qtcoap updated: 3f68e1d5f3...cfca0f5314

2
qtdoc

Submodule qtdoc updated: 8f054fd3f5...fc9424a169

2
qtmqtt

Submodule qtmqtt updated: 1c9afc958a...876038bdd3

Submodule qtopcua updated: 0afabce65c...987c336341

2
qtqa

Submodule qtqa updated: e77b736871...bc186f6af1

Submodule qtscxml updated: a926bf1de9...470d82fa5b

2
qtsvg

Submodule qtsvg updated: e1db462359...09b5285eb0

Submodule qttools updated: d9f5cc9c22...0839ca39af