Adjust submodule branches

Change-Id: Iccda1dd392e64f8bc4fa0dc66ef964c36312e26a
This commit is contained in:
Jani Heikkinen
2020-11-20 11:24:35 +02:00
parent c0b8c8254c
commit 59bab92561

24
.gitmodules vendored
View File

@@ -1,20 +1,20 @@
[submodule "qtbase"] [submodule "qtbase"]
path = qtbase path = qtbase
url = ../qtbase.git url = ../qtbase.git
branch = dev branch = 6.0.0
status = essential status = essential
[submodule "qtsvg"] [submodule "qtsvg"]
depends = qtbase depends = qtbase
path = qtsvg path = qtsvg
url = ../qtsvg.git url = ../qtsvg.git
branch = dev branch = 6.0.0
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 = dev branch = 6.0.0
status = essential status = essential
[submodule "qtactiveqt"] [submodule "qtactiveqt"]
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 = dev branch = 6.0.0
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 = dev branch = 6.0.0
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 = dev branch = 6.0.0
status = essential status = essential
priority = 40 priority = 40
[submodule "qtrepotools"] [submodule "qtrepotools"]
@@ -123,7 +123,7 @@
recommends = qtdeclarative recommends = qtdeclarative
path = qtwayland path = qtwayland
url = ../qtwayland.git url = ../qtwayland.git
branch = dev branch = 6.0.0
status = addon status = addon
[submodule "qt3d"] [submodule "qt3d"]
depends = qtbase depends = qtbase
@@ -229,7 +229,7 @@
recommends = qtimageformats qtgraphicaleffects recommends = qtimageformats qtgraphicaleffects
path = qtquickcontrols2 path = qtquickcontrols2
url = ../qtquickcontrols2.git url = ../qtquickcontrols2.git
branch = dev branch = 6.0.0
status = essential status = essential
[submodule "qtpurchasing"] [submodule "qtpurchasing"]
depends = qtbase depends = qtbase
@@ -309,23 +309,23 @@
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtquicktimeline path = qtquicktimeline
url = ../qtquicktimeline url = ../qtquicktimeline
branch = dev branch = 6.0.0
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 = dev branch = 6.0.0
status = addon status = addon
[submodule "qtshadertools"] [submodule "qtshadertools"]
depends = qtbase depends = qtbase
path = qtshadertools path = qtshadertools
url = ../qtshadertools.git url = ../qtshadertools.git
branch = dev branch = 6.0.0
status = addon status = addon
[submodule "qt5compat"] [submodule "qt5compat"]
depends = qtbase depends = qtbase
path = qt5compat path = qt5compat
url = ../qt5compat.git url = ../qt5compat.git
branch = dev branch = 6.0.0
status = deprecated status = deprecated