aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2020-11-20 11:24:35 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2020-11-20 11:24:35 +0200
commit59bab92561701bac3534b4a1bd7dd35d8aace089 (patch)
treebbf08e7e53210e447b6eecf97d59311dd911e2c4
parentc0b8c8254cdc09755816a7f2361038202cd2390d (diff)
Adjust submodule branches
-rw-r--r--.gitmodules24
1 files changed, 12 insertions, 12 deletions
diff --git a/.gitmodules b/.gitmodules
index cb9a39d6..43f26747 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,20 +1,20 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
- branch = dev
+ branch = 6.0.0
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
- branch = dev
+ branch = 6.0.0
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
- branch = dev
+ branch = 6.0.0
status = essential
[submodule "qtactiveqt"]
depends = qtbase
@@ -34,7 +34,7 @@
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
- branch = dev
+ branch = 6.0.0
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
@@ -47,7 +47,7 @@
depends = qttools
path = qttranslations
url = ../qttranslations.git
- branch = dev
+ branch = 6.0.0
status = essential
priority = 30
[submodule "qtdoc"]
@@ -55,7 +55,7 @@
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
path = qtdoc
url = ../qtdoc.git
- branch = dev
+ branch = 6.0.0
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -123,7 +123,7 @@
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
- branch = dev
+ branch = 6.0.0
status = addon
[submodule "qt3d"]
depends = qtbase
@@ -229,7 +229,7 @@
recommends = qtimageformats qtgraphicaleffects
path = qtquickcontrols2
url = ../qtquickcontrols2.git
- branch = dev
+ branch = 6.0.0
status = essential
[submodule "qtpurchasing"]
depends = qtbase
@@ -309,23 +309,23 @@
depends = qtbase qtdeclarative
path = qtquicktimeline
url = ../qtquicktimeline
- branch = dev
+ branch = 6.0.0
status = addon
[submodule "qtquick3d"]
depends = qtbase qtdeclarative qtshadertools
path = qtquick3d
url = ../qtquick3d.git
- branch = dev
+ branch = 6.0.0
status = addon
[submodule "qtshadertools"]
depends = qtbase
path = qtshadertools
url = ../qtshadertools.git
- branch = dev
+ branch = 6.0.0
status = addon
[submodule "qt5compat"]
depends = qtbase
path = qt5compat
url = ../qt5compat.git
- branch = dev
+ branch = 6.0.0
status = deprecated