From 8e07b4271b21342cf2e48eeaebc68f962b3b11df Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 10 Aug 2021 14:26:59 +0200 Subject: Remove qtquickcontrols from .gitmodules This repository is not available in Qt6. Every repository that recommended qtquickcontrols already recommends qtquickcontrols2. Change-Id: I30980bbbe9ca495f12dc591a693ebc3a4a6a01bc Reviewed-by: Volker Hilsheimer Reviewed-by: Mitch Curtis Reviewed-by: Kai Koehne (cherry picked from commit 149cc2ebc026b279e7b9a3cbc361a71cf2966c67) --- .gitmodules | 13 +++---------- qtquickcontrols | 1 - 2 files changed, 3 insertions(+), 11 deletions(-) delete mode 160000 qtquickcontrols diff --git a/.gitmodules b/.gitmodules index 5a005b99..7b5a26fd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -52,7 +52,7 @@ priority = 30 [submodule "qtdoc"] depends = qtdeclarative qttools - recommends = qtmultimedia qtquickcontrols qtquickcontrols2 + recommends = qtmultimedia qtquickcontrols2 path = qtdoc url = ../qtdoc.git branch = 6.2 @@ -138,13 +138,6 @@ url = ../qtgraphicaleffects.git branch = 6.2 status = ignore -[submodule "qtquickcontrols"] - depends = qtdeclarative - recommends = qtgraphicaleffects - path = qtquickcontrols - url = ../qtquickcontrols.git - branch = 6.2 - status = ignore [submodule "qtserialbus"] depends = qtbase recommends = qtserialport @@ -174,7 +167,7 @@ status = addon [submodule "qtwebengine"] depends = qtdeclarative - recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools + recommends = qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git branch = 6.2 @@ -216,7 +209,7 @@ status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg - recommends = qtmultimedia qtquickcontrols + recommends = qtmultimedia path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = 6.2 diff --git a/qtquickcontrols b/qtquickcontrols deleted file mode 160000 index d2598984..00000000 --- a/qtquickcontrols +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d25989845394b6a9a2c103e5c70768e57083e189 -- cgit v1.2.3