mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-21 20:36:54 +08:00
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 <toni.saario@qt.io>
This commit is contained in:
36
.gitmodules
vendored
36
.gitmodules
vendored
@@ -21,7 +21,7 @@
|
|||||||
path = qtactiveqt
|
path = qtactiveqt
|
||||||
url = ../qtactiveqt.git
|
url = ../qtactiveqt.git
|
||||||
branch = dev
|
branch = dev
|
||||||
status = ignore
|
status = additionalLibrary
|
||||||
[submodule "qtmultimedia"]
|
[submodule "qtmultimedia"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative
|
recommends = qtdeclarative
|
||||||
@@ -125,13 +125,13 @@
|
|||||||
path = qt3d
|
path = qt3d
|
||||||
url = ../qt3d.git
|
url = ../qt3d.git
|
||||||
branch = dev
|
branch = dev
|
||||||
status = ignore
|
status = additionalLibrary
|
||||||
[submodule "qtimageformats"]
|
[submodule "qtimageformats"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtimageformats
|
path = qtimageformats
|
||||||
url = ../qtimageformats.git
|
url = ../qtimageformats.git
|
||||||
branch = dev
|
branch = dev
|
||||||
status = ignore
|
status = additionalLibrary
|
||||||
[submodule "qtgraphicaleffects"]
|
[submodule "qtgraphicaleffects"]
|
||||||
depends = qtdeclarative
|
depends = qtdeclarative
|
||||||
path = qtgraphicaleffects
|
path = qtgraphicaleffects
|
||||||
@@ -238,21 +238,21 @@
|
|||||||
path = qtcharts
|
path = qtcharts
|
||||||
url = ../qtcharts.git
|
url = ../qtcharts.git
|
||||||
branch = dev
|
branch = dev
|
||||||
status = ignore
|
status = additionalLibrary
|
||||||
[submodule "qtdatavis3d"]
|
[submodule "qtdatavis3d"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative qtmultimedia
|
recommends = qtdeclarative qtmultimedia
|
||||||
path = qtdatavis3d
|
path = qtdatavis3d
|
||||||
url = ../qtdatavis3d.git
|
url = ../qtdatavis3d.git
|
||||||
branch = dev
|
branch = dev
|
||||||
status = ignore
|
status = additionalLibrary
|
||||||
[submodule "qtvirtualkeyboard"]
|
[submodule "qtvirtualkeyboard"]
|
||||||
depends = qtbase qtdeclarative qtsvg
|
depends = qtbase qtdeclarative qtsvg
|
||||||
recommends = qtmultimedia qtquickcontrols
|
recommends = qtmultimedia qtquickcontrols
|
||||||
path = qtvirtualkeyboard
|
path = qtvirtualkeyboard
|
||||||
url = ../qtvirtualkeyboard.git
|
url = ../qtvirtualkeyboard.git
|
||||||
branch = dev
|
branch = dev
|
||||||
status = ignore
|
status = additionalLibrary
|
||||||
[submodule "qtgamepad"]
|
[submodule "qtgamepad"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative
|
recommends = qtdeclarative
|
||||||
@@ -265,7 +265,7 @@
|
|||||||
path = qtscxml
|
path = qtscxml
|
||||||
url = ../qtscxml.git
|
url = ../qtscxml.git
|
||||||
branch = dev
|
branch = dev
|
||||||
status = ignore
|
status = additionalLibrary
|
||||||
[submodule "qtspeech"]
|
[submodule "qtspeech"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative qtmultimedia
|
recommends = qtdeclarative qtmultimedia
|
||||||
@@ -278,7 +278,7 @@
|
|||||||
path = qtnetworkauth
|
path = qtnetworkauth
|
||||||
url = ../qtnetworkauth.git
|
url = ../qtnetworkauth.git
|
||||||
branch = dev
|
branch = dev
|
||||||
status = ignore
|
status = additionalLibrary
|
||||||
[submodule "qtremoteobjects"]
|
[submodule "qtremoteobjects"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative
|
recommends = qtdeclarative
|
||||||
@@ -298,7 +298,7 @@
|
|||||||
path = qtlottie
|
path = qtlottie
|
||||||
url = ../qtlottie.git
|
url = ../qtlottie.git
|
||||||
branch = dev
|
branch = dev
|
||||||
status = ignore
|
status = additionalLibrary
|
||||||
[submodule "qtquicktimeline"]
|
[submodule "qtquicktimeline"]
|
||||||
depends = qtbase qtdeclarative
|
depends = qtbase qtdeclarative
|
||||||
path = qtquicktimeline
|
path = qtquicktimeline
|
||||||
@@ -323,3 +323,21 @@
|
|||||||
url = ../qt5compat.git
|
url = ../qt5compat.git
|
||||||
branch = dev
|
branch = dev
|
||||||
status = deprecated
|
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
|
||||||
|
|||||||
1
qtcoap
Submodule
1
qtcoap
Submodule
Submodule qtcoap added at 22aa407eca
1
qtmqtt
Submodule
1
qtmqtt
Submodule
Submodule qtmqtt added at 1e7bf20965
1
qtopcua
Submodule
1
qtopcua
Submodule
Submodule qtopcua added at 32c693e7fd
Reference in New Issue
Block a user