From 149cc2ebc026b279e7b9a3cbc361a71cf2966c67 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 9 Aug 2021 15:37:14 +0200 Subject: [PATCH] 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 Reviewed-by: Mitch Curtis Reviewed-by: Kai Koehne --- .gitmodules | 13 +++---------- qtquickcontrols | 1 - 2 files changed, 3 insertions(+), 11 deletions(-) delete mode 160000 qtquickcontrols 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 index d2598984..00000000 --- a/qtquickcontrols +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d25989845394b6a9a2c103e5c70768e57083e189