aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2021-01-27 12:05:14 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-02-07 11:22:54 +0000
commit3a8a4d2b11a5282ac7930eeae71781c4c9342340 (patch)
tree42b0902cbc72cc55e20532e7277cb3740aaa5b34 /.gitmodules
parentbda440057939dd527f9d4f44f5075421a3dbee45 (diff)
Add Qt 6.1.0 Additional libraries
Set status to additionalLibrary to ones already in .gitmodules as ignore status Add missing ones with status = additionalLibrary Task-number: QTBUG-90669 Change-Id: I5f7518c516d10ae68fb5cf20851b36bde4fbc0b2 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit dba2b570b962f3e62a7e7154c57da9137b8c9e42) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules36
1 files changed, 27 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules
index ef03efec..ef36a140 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -21,7 +21,7 @@
path = qtactiveqt
url = ../qtactiveqt.git
branch = dev
- status = ignore
+ status = additionalLibrary
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
@@ -125,13 +125,13 @@
path = qt3d
url = ../qt3d.git
branch = dev
- status = ignore
+ status = additionalLibrary
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = dev
- status = ignore
+ status = additionalLibrary
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
@@ -238,21 +238,21 @@
path = qtcharts
url = ../qtcharts.git
branch = dev
- status = ignore
+ status = additionalLibrary
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = dev
- status = ignore
+ status = additionalLibrary
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = dev
- status = ignore
+ status = additionalLibrary
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
@@ -265,7 +265,7 @@
path = qtscxml
url = ../qtscxml.git
branch = dev
- status = ignore
+ status = additionalLibrary
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
@@ -278,7 +278,7 @@
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = dev
- status = ignore
+ status = additionalLibrary
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
@@ -298,7 +298,7 @@
path = qtlottie
url = ../qtlottie.git
branch = dev
- status = ignore
+ status = additionalLibrary
[submodule "qtquicktimeline"]
depends = qtbase qtdeclarative
path = qtquicktimeline
@@ -323,3 +323,21 @@
url = ../qt5compat.git
branch = 6.1
status = deprecated
+[submodule "qtcoap"]
+ depends = qtbase qttools
+ path = qtcoap
+ url = ../qtcoap.git
+ branch = dev
+ status = additionalLibrary
+[submodule "qtmqtt"]
+ depends = qtbase qtdeclarative qttools
+ path = qtmqtt
+ url = ../qtmqtt.git
+ branch = dev
+ status = additionalLibrary
+[submodule "qtopcua"]
+ depends = qtbase qtdeclarative qtquickcontrols2 qttools
+ path = qtopcua
+ url = ../qtopcua.git
+ branch = dev
+ status = additionalLibrary