aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules81
1 files changed, 52 insertions, 29 deletions
diff --git a/.gitmodules b/.gitmodules
index f7e38515..fd72b8a0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,26 +1,27 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
- branch = dev
+ branch = 6.1
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
- branch = dev
+ branch = 6.1
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
- branch = dev
+ branch = 6.1
status = essential
[submodule "qtactiveqt"]
depends = qtbase
+ recommends = qttools
path = qtactiveqt
url = ../qtactiveqt.git
- branch = dev
+ branch = 6.1
status = addon
[submodule "qtmultimedia"]
depends = qtbase
@@ -31,10 +32,10 @@
status = ignore
[submodule "qttools"]
depends = qtbase
- recommends = qtdeclarative qtactiveqt
+ recommends = qtdeclarative
path = qttools
url = ../qttools.git
- branch = dev
+ branch = 6.1
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
@@ -47,7 +48,7 @@
depends = qttools
path = qttranslations
url = ../qttranslations.git
- branch = dev
+ branch = 6.1
status = essential
priority = 30
[submodule "qtdoc"]
@@ -55,7 +56,7 @@
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
path = qtdoc
url = ../qtdoc.git
- branch = dev
+ branch = 6.1
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -117,20 +118,21 @@
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
- branch = dev
+ branch = 6.1
status = addon
[submodule "qt3d"]
depends = qtbase
- recommends = qtdeclarative qtshadertools
+ recommends = qtdeclarative qtshadertools qttools
path = qt3d
url = ../qt3d.git
- branch = dev
+ branch = 6.1
status = addon
[submodule "qtimageformats"]
depends = qtbase
+ recommends = qttools
path = qtimageformats
url = ../qtimageformats.git
- branch = dev
+ branch = 6.1
status = addon
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
@@ -223,7 +225,7 @@
recommends = qtimageformats qtgraphicaleffects
path = qtquickcontrols2
url = ../qtquickcontrols2.git
- branch = dev
+ branch = 6.1
status = essential
[submodule "qtpurchasing"]
depends = qtbase
@@ -234,25 +236,25 @@
status = ignore
[submodule "qtcharts"]
depends = qtbase
- recommends = qtdeclarative qtmultimedia
+ recommends = qtdeclarative qtmultimedia qttools
path = qtcharts
url = ../qtcharts.git
- branch = dev
+ branch = 6.1
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
- recommends = qtdeclarative qtmultimedia
+ recommends = qtdeclarative qtmultimedia qttools
path = qtdatavis3d
url = ../qtdatavis3d.git
- branch = dev
+ branch = 6.1
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
- recommends = qtmultimedia qtquickcontrols
+ recommends = qtmultimedia qtquickcontrols qttools
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
- branch = dev
- status = ignore
+ branch = 6.1
+ status = additionalLibrary
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
@@ -262,9 +264,10 @@
status = ignore
[submodule "qtscxml"]
depends = qtbase qtdeclarative
+ recommends = qttools
path = qtscxml
url = ../qtscxml.git
- branch = dev
+ branch = 6.1
status = addon
[submodule "qtspeech"]
depends = qtbase
@@ -275,10 +278,11 @@
status = ignore
[submodule "qtnetworkauth"]
depends = qtbase
+ recommends = qttools
path = qtnetworkauth
url = ../qtnetworkauth.git
- branch = dev
- status = ignore
+ branch = 6.1
+ status = additionalLibrary
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
@@ -295,31 +299,50 @@
status = ignore
[submodule "qtlottie"]
depends = qtbase qtdeclarative
+ recommends = qttools
path = qtlottie
url = ../qtlottie.git
- branch = dev
- status = ignore
+ branch = 6.1
+ status = additionalLibrary
[submodule "qtquicktimeline"]
depends = qtbase qtdeclarative
path = qtquicktimeline
url = ../qtquicktimeline
- branch = dev
+ branch = 6.1
status = addon
[submodule "qtquick3d"]
depends = qtbase qtdeclarative qtshadertools
path = qtquick3d
url = ../qtquick3d.git
- branch = dev
+ branch = 6.1
status = addon
[submodule "qtshadertools"]
depends = qtbase
path = qtshadertools
url = ../qtshadertools.git
- branch = dev
+ branch = 6.1
status = addon
[submodule "qt5compat"]
depends = qtbase qtdeclarative
path = qt5compat
url = ../qt5compat.git
- branch = dev
+ branch = 6.1
status = deprecated
+[submodule "qtcoap"]
+ depends = qtbase qttools
+ path = qtcoap
+ url = ../qtcoap.git
+ branch = 6.1
+ status = additionalLibrary
+[submodule "qtmqtt"]
+ depends = qtbase qtdeclarative qttools
+ path = qtmqtt
+ url = ../qtmqtt.git
+ branch = 6.1
+ status = additionalLibrary
+[submodule "qtopcua"]
+ depends = qtbase qtdeclarative qtquickcontrols2 qttools
+ path = qtopcua
+ url = ../qtopcua.git
+ branch = 6.1
+ status = additionalLibrary