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 index dd698034..e046a40b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit dd698034fd191807a1c02fd49c8cc87ec61d5b44 +Subproject commit e046a40b74ba9d25f1c73165b74eb805e330ff8f diff --git a/qtcoap b/qtcoap new file mode 160000 index 00000000..3a836731 --- /dev/null +++ b/qtcoap @@ -0,0 +1 @@ +Subproject commit 3a836731a4b904d862985f505f44f2356c8098a8 diff --git a/qtimageformats b/qtimageformats index 7cb70c79..f83d417b 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 7cb70c79902b0a507815bd1b71f840aa73920063 +Subproject commit f83d417b7b8595b384f9fba96b96107f474df33a diff --git a/qtmqtt b/qtmqtt new file mode 160000 index 00000000..6f5421ed --- /dev/null +++ b/qtmqtt @@ -0,0 +1 @@ +Subproject commit 6f5421edeac6a7832093966e4aea794cb89ef564 diff --git a/qtnetworkauth b/qtnetworkauth index e151a7af..47c31c9e 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit e151a7afc6ad36dc2df3eeda95154804a261d15d +Subproject commit 47c31c9e33f50fd215be1e63135faa7645d0cfa1 diff --git a/qtopcua b/qtopcua new file mode 160000 index 00000000..2c606cc2 --- /dev/null +++ b/qtopcua @@ -0,0 +1 @@ +Subproject commit 2c606cc2aeb8d64d6a51a3715b5a5d6b293c7ff3