diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-03-18 10:00:19 +0000 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2021-03-26 11:43:59 +0000 |
| commit | 4d6b15b0b672dab50dbc9b121534204b01f0980d (patch) | |
| tree | 697e1b76d3b705fc7a96f7c7f344ecceac5e809c | |
| parent | 55874781a1d66694e4db988403ae66c35041b179 (diff) | |
Revert "Add qttools as additional dependency to additional libraries"
This reverts commit b194786ec993ae51e234ba6cf38c515f9963b712.
Reason for revert: additional libraries will be part of qt5.git build -> we don't need to have qttools as dependency there anymore
Change-Id: Ib4177b35ecd58ea682a69f6e4e68e4ddd5e24e49
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | .gitmodules | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules index 317ca556..fafe33b2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,7 +18,6 @@ status = essential [submodule "qtactiveqt"] depends = qtbase - recommends = qttools path = qtactiveqt url = ../qtactiveqt.git branch = 6.1 @@ -122,14 +121,13 @@ status = addon [submodule "qt3d"] depends = qtbase - recommends = qtdeclarative qtshadertools qttools + recommends = qtdeclarative qtshadertools path = qt3d url = ../qt3d.git branch = 6.1 status = addon [submodule "qtimageformats"] depends = qtbase - recommends = qttools path = qtimageformats url = ../qtimageformats.git branch = 6.1 @@ -236,21 +234,21 @@ status = ignore [submodule "qtcharts"] depends = qtbase - recommends = qtdeclarative qtmultimedia qttools + recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git branch = 6.1 status = addon [submodule "qtdatavis3d"] depends = qtbase - recommends = qtdeclarative qtmultimedia qttools + recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git branch = 6.1 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg - recommends = qtmultimedia qtquickcontrols qttools + recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = 6.1 @@ -264,7 +262,6 @@ status = ignore [submodule "qtscxml"] depends = qtbase qtdeclarative - recommends = qttools path = qtscxml url = ../qtscxml.git branch = 6.1 @@ -278,7 +275,6 @@ status = ignore [submodule "qtnetworkauth"] depends = qtbase - recommends = qttools path = qtnetworkauth url = ../qtnetworkauth.git branch = 6.1 @@ -299,7 +295,6 @@ status = ignore [submodule "qtlottie"] depends = qtbase qtdeclarative - recommends = qttools path = qtlottie url = ../qtlottie.git branch = 6.1 |