diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-08-09 15:37:14 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-08-10 12:37:46 +0200 |
| commit | 149cc2ebc026b279e7b9a3cbc361a71cf2966c67 (patch) | |
| tree | 62222bfb3a379ec9e1a704fc644103b8f7a6cd84 | |
| parent | b2ff16b6d1e2e205b722e197dbeca002394555da (diff) | |
Remove qtquickcontrols from .gitmodules
This repository is not available in Qt6.
Every repository that recommends qtquickcontrols should recommend
qtquickcontrols2 instead. However, this has been merged into
qtdeclarative, which means that the existent dependencies on
qtdeclarative are sufficient.
Pick-to: 6.2
Change-Id: I30980bbbe9ca495f12dc591a693ebc3a4a6a01bc
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -rw-r--r-- | .gitmodules | 13 | ||||
| m--------- | qtquickcontrols | 0 |
2 files changed, 3 insertions, 10 deletions
diff --git a/.gitmodules b/.gitmodules index 03df1f82..3655d567 100644 --- a/.gitmodules +++ b/.gitmodules @@ -52,7 +52,7 @@ priority = 30 [submodule "qtdoc"] depends = qtdeclarative qttools - recommends = qtmultimedia qtquickcontrols + recommends = qtmultimedia path = qtdoc url = ../qtdoc.git branch = dev @@ -138,13 +138,6 @@ url = ../qtgraphicaleffects.git branch = dev status = ignore -[submodule "qtquickcontrols"] - depends = qtdeclarative - recommends = qtgraphicaleffects - path = qtquickcontrols - url = ../qtquickcontrols.git - branch = dev - status = ignore [submodule "qtserialbus"] depends = qtbase recommends = qtserialport @@ -174,7 +167,7 @@ status = addon [submodule "qtwebengine"] depends = qtdeclarative - recommends = qtquickcontrols qtlocation qtwebchannel qttools + recommends = qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git branch = dev @@ -209,7 +202,7 @@ status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg - recommends = qtmultimedia qtquickcontrols + recommends = qtmultimedia path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = dev diff --git a/qtquickcontrols b/qtquickcontrols deleted file mode 160000 -Subproject d25989845394b6a9a2c103e5c70768e57083e18 |