From a3f580b0abd3833bf23bf1cb7cc213161799d288 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 29 Jul 2021 10:52:47 +0200 Subject: [PATCH] Remove qtquickcontrols2 submodule It's now a part of qtdeclarative. Fixes: QTBUG-95416 Change-Id: I2e308914aa0c97608534187737b6d5ea596f100c Reviewed-by: Jani Heikkinen (cherry picked from commit ed7a7e75ffc9f9a949d3e3d484a7c69aeed116f5) Reviewed-by: Alexandru Croitor --- .gitmodules | 15 ++++----------- qtquickcontrols2 | 1 - 2 files changed, 4 insertions(+), 12 deletions(-) delete mode 160000 qtquickcontrols2 diff --git a/.gitmodules b/.gitmodules index 7b5a26fd..d8b21aa7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,7 +24,7 @@ status = addon [submodule "qtmultimedia"] depends = qtbase qtshadertools - recommends = qtdeclarative qtquickcontrols2 + recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git branch = 6.2 @@ -52,7 +52,7 @@ priority = 30 [submodule "qtdoc"] depends = qtdeclarative qttools - recommends = qtmultimedia qtquickcontrols2 + recommends = qtmultimedia path = qtdoc url = ../qtdoc.git branch = 6.2 @@ -167,7 +167,7 @@ status = addon [submodule "qtwebengine"] depends = qtdeclarative - recommends = qtquickcontrols2 qtlocation qtwebchannel qttools + recommends = qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git branch = 6.2 @@ -186,13 +186,6 @@ url = ../qtwebview.git branch = 6.2 status = addon -[submodule "qtquickcontrols2"] - depends = qtdeclarative - recommends = qtimageformats qtgraphicaleffects - path = qtquickcontrols2 - url = ../qtquickcontrols2.git - branch = 6.2 - status = essential [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia @@ -298,7 +291,7 @@ branch = 6.2 status = addon [submodule "qtopcua"] - depends = qtbase qtdeclarative qtquickcontrols2 + depends = qtbase qtdeclarative path = qtopcua url = ../qtopcua.git branch = 6.2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 deleted file mode 160000 index 57753efd..00000000 --- a/qtquickcontrols2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 57753efded8966c5533415723b42c4133213ed69