diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-02-25 10:48:06 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-02-26 10:14:09 +0200 |
| commit | 17abff55d5997e501c1bc162cde604e313f77ac6 (patch) | |
| tree | 8b09452074359c33bb4e9d51db0a9ef45d39bd71 | |
| parent | e9ecfdb335ad7447998b44e51d47dcafd8584007 (diff) | |
Add missing additional libraries in qt5.git
We are now supporting 'status = additionalLibrary' for submodules. So
add missing additional libraries and update statuses accordingly
Change-Id: I4e87b92e15ec54e965af94af5841cd3a8a8278ef
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
| -rw-r--r-- | .gitmodules | 30 | ||||
| m--------- | qt3d | 0 | ||||
| m--------- | qtcoap | 0 | ||||
| m--------- | qtimageformats | 0 | ||||
| m--------- | qtmqtt | 0 | ||||
| m--------- | qtnetworkauth | 0 | ||||
| m--------- | qtopcua | 0 |
7 files changed, 24 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules index b306d175..653b6f1f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -124,14 +124,14 @@ recommends = qtdeclarative qtshadertools path = qt3d url = ../qt3d.git - branch = dev - status = ignore + branch = 6.0 + status = additionalLibrary [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = dev - status = ignore + branch = 6.0 + status = additionalLibrary [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects @@ -277,8 +277,8 @@ depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = dev - status = ignore + branch = 6.0 + status = additionalLibrary [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative @@ -323,3 +323,21 @@ url = ../qt5compat.git branch = 6.0 status = deprecated +[submodule "qtcoap"] + depends = qtbase qttools + path = qtcoap + url = ../qtcoap.git + branch = 6.0 + status = additionalLibrary +[submodule "qtmqtt"] + depends = qtbase qtdeclarative qttools + path = qtmqtt + url = ../qtmqtt.git + branch = 6.0 + status = additionalLibrary +[submodule "qtopcua"] + depends = qtbase qtdeclarative qtquickcontrols2 qttools + path = qtopcua + url = ../qtopcua.git + branch = 6.0 + status = additionalLibrary diff --git a/qt3d b/qt3d -Subproject dd698034fd191807a1c02fd49c8cc87ec61d5b4 +Subproject e046a40b74ba9d25f1c73165b74eb805e330ff8 diff --git a/qtcoap b/qtcoap new file mode 160000 +Subproject 3a836731a4b904d862985f505f44f2356c8098a diff --git a/qtimageformats b/qtimageformats -Subproject 7cb70c79902b0a507815bd1b71f840aa7392006 +Subproject f83d417b7b8595b384f9fba96b96107f474df33 diff --git a/qtmqtt b/qtmqtt new file mode 160000 +Subproject 6f5421edeac6a7832093966e4aea794cb89ef56 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject e151a7afc6ad36dc2df3eeda95154804a261d15 +Subproject 47c31c9e33f50fd215be1e63135faa7645d0cfa diff --git a/qtopcua b/qtopcua new file mode 160000 +Subproject 2c606cc2aeb8d64d6a51a3715b5a5d6b293c7ff |