Merge commit 'b021c416b50598dd8da6e7099318ab4b31b6e3ab' into pyside6.0

Change-Id: I3ca531ac8f6b72d6d2ad4e28522b3ef4ab8e8f80
This commit is contained in:
Simo Fält
2021-03-26 14:12:14 +02:00
23 changed files with 57 additions and 29 deletions

26
.gitmodules vendored
View File

@@ -124,13 +124,13 @@
recommends = qtdeclarative qtshadertools
path = qt3d
url = ../qt3d.git
branch = dev
branch = 6.0
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = dev
branch = 6.0
status = addon
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
@@ -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