aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2020-10-09 12:39:46 +0300
committerJani Heikkinen <jani.heikkinen@qt.io>2020-10-12 19:28:10 +0300
commita892a2ca19ad658869dbbaa4eac1e4d4bdcd1afe (patch)
tree28447bd29d82064cb376da044630a01301e3cb0d
parenteb2295498fbcf39674107a98f4bbdf4cc8177476 (diff)
Remove unnecessary add-ons from .gitmodules
qt3d, qtimageformats and qtnetworkaut will be delivered via package manager so those shouldn't be in qt5.git integrations from Qt 6.0 -> Task-number: QTBUG-87255 Change-Id: I2ddaf561123153b78b4bd972c22a90ba1309a91d Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
-rw-r--r--.gitmodules6
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules
index bffa221b..cb9a39d6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -131,13 +131,13 @@
path = qt3d
url = ../qt3d.git
branch = dev
- status = addon
+ status = ignore
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = dev
- status = addon
+ status = ignore
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
@@ -284,7 +284,7 @@
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = dev
- status = addon
+ status = ignore
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative