diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2021-07-29 10:52:47 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2021-08-02 10:06:04 +0200 |
| commit | ed7a7e75ffc9f9a949d3e3d484a7c69aeed116f5 (patch) | |
| tree | c55bde74902aabd0cdefce41008de2b95a1fc66d /.gitmodules | |
| parent | f4c302caf2167c37cc9963fc88ba55fc3cba65dc (diff) | |
Remove qtquickcontrols2 submodule
It's now a part of qtdeclarative.
Fixes: QTBUG-95416
Change-Id: I2e308914aa0c97608534187737b6d5ea596f100c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/.gitmodules b/.gitmodules index e08a1a6a..f022d3b1 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 = dev @@ -52,7 +52,7 @@ priority = 30 [submodule "qtdoc"] depends = qtdeclarative qttools - recommends = qtmultimedia qtquickcontrols qtquickcontrols2 + recommends = qtmultimedia qtquickcontrols path = qtdoc url = ../qtdoc.git branch = dev @@ -174,7 +174,7 @@ status = addon [submodule "qtwebengine"] depends = qtdeclarative - recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools + recommends = qtquickcontrols qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git branch = dev @@ -193,13 +193,6 @@ url = ../qtwebview.git branch = dev status = addon -[submodule "qtquickcontrols2"] - depends = qtdeclarative - recommends = qtimageformats qtgraphicaleffects - path = qtquickcontrols2 - url = ../qtquickcontrols2.git - branch = dev - status = essential [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia @@ -305,7 +298,7 @@ branch = dev status = addon [submodule "qtopcua"] - depends = qtbase qtdeclarative qtquickcontrols2 + depends = qtbase qtdeclarative path = qtopcua url = ../qtopcua.git branch = dev |