qiurui
/
qt5
mirror of https://github.com/qt/qt5.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove qtquickcontrols2 submodule 

It's now a part of qtdeclarative.

Fixes: QTBUG-95416
Change-Id: I2e308914aa0c97608534187737b6d5ea596f100c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Mitch Curtis 2021-07-29 10:52:47 +02:00
parent f4c302caf2
commit ed7a7e75ff
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitmodules vendored
View File

@ -24,7 +24,7 @@
status = addon status = addon
[submodule "qtmultimedia"] [submodule "qtmultimedia"]
depends = qtbase qtshadertools depends = qtbase qtshadertools
recommends = qtdeclarative qtquickcontrols2 recommends = qtdeclarative
path = qtmultimedia path = qtmultimedia
url = ../qtmultimedia.git url = ../qtmultimedia.git
branch = dev branch = dev
@ -52,7 +52,7 @@
priority = 30 priority = 30
[submodule "qtdoc"] [submodule "qtdoc"]
depends = qtdeclarative qttools depends = qtdeclarative qttools
recommends = qtmultimedia qtquickcontrols qtquickcontrols2 recommends = qtmultimedia qtquickcontrols
path = qtdoc path = qtdoc
url = ../qtdoc.git url = ../qtdoc.git
branch = dev branch = dev
@ -174,7 +174,7 @@
status = addon status = addon
[submodule "qtwebengine"] [submodule "qtwebengine"]
depends = qtdeclarative depends = qtdeclarative
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools recommends = qtquickcontrols qtlocation qtwebchannel qttools
path = qtwebengine path = qtwebengine
url = ../qtwebengine.git url = ../qtwebengine.git
branch = dev branch = dev
@ -193,13 +193,6 @@
url = ../qtwebview.git url = ../qtwebview.git
branch = dev branch = dev
status = addon status = addon
[submodule "qtquickcontrols2"]
depends = qtdeclarative
recommends = qtimageformats qtgraphicaleffects
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = dev
status = essential
[submodule "qtcharts"] [submodule "qtcharts"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
@ -305,7 +298,7 @@
branch = dev branch = dev
status = addon status = addon
[submodule "qtopcua"] [submodule "qtopcua"]
depends = qtbase qtdeclarative qtquickcontrols2 depends = qtbase qtdeclarative
path = qtopcua path = qtopcua
url = ../qtopcua.git url = ../qtopcua.git
branch = dev branch = dev

1
qtquickcontrols2

@ -1 +0,0 @@
Subproject commit 89d3486ad18d782a8141037a2bffb7992118cc78