Compare commits

...

5 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
2791995451 Update submodules on '6.1.1' in qt/qt5
Change-Id: I37f65bb70d20b970406f4bda816f375d805ff411
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-03 07:12:24 +03:00
Qt Submodule Update Bot
293c831a03 Update submodules on '6.1.1' in qt/qt5
Change-Id: I0fc682f318ae89458fd4c5ae04252ca1c9b83482
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-28 17:45:43 +03:00
Qt Submodule Update Bot
f4bbae69fb Update submodules on '6.1.1' in qt/qt5
Change-Id: If2dd67135d5c92541d02434e92c423d5e6990025
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-27 15:09:25 +03:00
Jani Heikkinen
026c2434ef Correct m2m submodule branches
Change-Id: I457a0f370c2a0a3d0511af468e984f621f70ad92
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2021-05-25 12:54:34 +03:00
Jani Heikkinen
e74586aa85 Adjust submodule branches 2021-05-25 12:02:29 +03:00
26 changed files with 49 additions and 49 deletions

48
.gitmodules vendored
View File

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

2
qt3d

Submodule qt3d updated: 5ed6314a3b...40b2754dfd

2
qtbase

Submodule qtbase updated: 192991ae35...179b3f6797

2
qtcoap

Submodule qtcoap updated: dad66db1fa...9298cdd408

2
qtdoc

Submodule qtdoc updated: 66cbfe11be...a9889f9e0e

2
qtmqtt

Submodule qtmqtt updated: abf1996948...6cbd930f14

Submodule qtopcua updated: 34a53d2f41...acc43cee31

2
qtqa

Submodule qtqa updated: 26f70612e5...7fb6de8e0d

Submodule qtscxml updated: 547a31368b...abb003fa7c

2
qtsvg

Submodule qtsvg updated: 7b0e643168...dd0649d1d2

Submodule qttools updated: 418229d46c...7fe527d19d