From dba2b570b962f3e62a7e7154c57da9137b8c9e42 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 27 Jan 2021 12:05:14 +0200 Subject: [PATCH] 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 Pick-to: 6.1 Change-Id: I5f7518c516d10ae68fb5cf20851b36bde4fbc0b2 Reviewed-by: Toni Saario --- .gitmodules | 36 +++++++++++++++++++++++++++--------- qtcoap | 1 + qtmqtt | 1 + qtopcua | 1 + 4 files changed, 30 insertions(+), 9 deletions(-) create mode 160000 qtcoap create mode 160000 qtmqtt create mode 160000 qtopcua diff --git a/.gitmodules b/.gitmodules index 06f685c4..bf548235 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 = dev 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 diff --git a/qtcoap b/qtcoap new file mode 160000 index 00000000..22aa407e --- /dev/null +++ b/qtcoap @@ -0,0 +1 @@ +Subproject commit 22aa407eca1f55144474add10afc3d99288b5fd4 diff --git a/qtmqtt b/qtmqtt new file mode 160000 index 00000000..1e7bf209 --- /dev/null +++ b/qtmqtt @@ -0,0 +1 @@ +Subproject commit 1e7bf20965c832f213c6bb14ebfd447cb0039c7a diff --git a/qtopcua b/qtopcua new file mode 160000 index 00000000..32c693e7 --- /dev/null +++ b/qtopcua @@ -0,0 +1 @@ +Subproject commit 32c693e7fd3a7e4fb43ce19b33a15edfafd6572e