From 919aa17249c6f86e0183a356b09fe7ebbe987336 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 8 Feb 2021 08:47:45 +0200 Subject: [PATCH] Add qttools as additional dependency to additional libraries qttools is needed to be able to build documentation Pick-to: 6.1 Fixes: QTBUG-90996 Change-Id: I27f101dc4294f830b9915e1530d660cfe12aeabe Reviewed-by: Toni Saario --- .gitmodules | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index bf548235..46632554 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,6 +18,7 @@ status = essential [submodule "qtactiveqt"] depends = qtbase + recommends = qttools path = qtactiveqt url = ../qtactiveqt.git branch = dev @@ -121,13 +122,14 @@ status = addon [submodule "qt3d"] depends = qtbase - recommends = qtdeclarative qtshadertools + recommends = qtdeclarative qtshadertools qttools path = qt3d url = ../qt3d.git branch = dev status = additionalLibrary [submodule "qtimageformats"] depends = qtbase + recommends = qttools path = qtimageformats url = ../qtimageformats.git branch = dev @@ -234,21 +236,21 @@ status = ignore [submodule "qtcharts"] depends = qtbase - recommends = qtdeclarative qtmultimedia + recommends = qtdeclarative qtmultimedia qttools path = qtcharts url = ../qtcharts.git branch = dev status = additionalLibrary [submodule "qtdatavis3d"] depends = qtbase - recommends = qtdeclarative qtmultimedia + recommends = qtdeclarative qtmultimedia qttools path = qtdatavis3d url = ../qtdatavis3d.git branch = dev status = additionalLibrary [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg - recommends = qtmultimedia qtquickcontrols + recommends = qtmultimedia qtquickcontrols qttools path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = dev @@ -262,6 +264,7 @@ status = ignore [submodule "qtscxml"] depends = qtbase qtdeclarative + recommends = qttools path = qtscxml url = ../qtscxml.git branch = dev @@ -275,6 +278,7 @@ status = ignore [submodule "qtnetworkauth"] depends = qtbase + recommends = qttools path = qtnetworkauth url = ../qtnetworkauth.git branch = dev @@ -295,6 +299,7 @@ status = ignore [submodule "qtlottie"] depends = qtbase qtdeclarative + recommends = qttools path = qtlottie url = ../qtlottie.git branch = dev