From 06c3d40cc90ae33a4d06b3dc21b9c0f23ad00c35 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 18 Dec 2015 18:50:54 +0100 Subject: move module dependencies from qt.pro to .gitmodules this removes the last redundant module list. the module build order which is not determined by dependencies is pretty random now. this is avoided for a few heavy and "less relevant" modules by setting a priority to built them as late as possible. Change-Id: Ie8ef9777d050a4915cd2282dc9ccb48fcdbc02d2 Reviewed-by: Oswald Buddenhagen Reviewed-by: Simon Hausmann --- .gitmodules | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 211c331c..49c27df9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,193 +4,258 @@ branch = 5.6 initrepo = true [submodule "qtsvg"] + depends = qtbase path = qtsvg url = ../qtsvg.git branch = 5.6 initrepo = true [submodule "qtdeclarative"] + depends = qtbase + recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git branch = 5.6 initrepo = true [submodule "qtactiveqt"] + depends = qtbase path = qtactiveqt url = ../qtactiveqt.git branch = 5.6 initrepo = true [submodule "qtscript"] + depends = qtbase + recommends = qttools path = qtscript url = ../qtscript.git branch = 5.6 initrepo = true [submodule "qtmultimedia"] + depends = qtbase + recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git branch = 5.6 initrepo = true [submodule "qttools"] + depends = qtbase + recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git branch = 5.6 initrepo = true [submodule "qtxmlpatterns"] + depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git branch = 5.6 initrepo = true [submodule "qttranslations"] + depends = qttools path = qttranslations url = ../qttranslations.git branch = 5.6 initrepo = true + priority = 30 [submodule "qtdoc"] + depends = qtdeclarative path = qtdoc url = ../qtdoc.git branch = 5.6 initrepo = true + priority = 40 [submodule "qtrepotools"] path = qtrepotools url = ../qtrepotools.git branch = master initrepo = true + qt = false [submodule "qtwebkit"] + depends = qtbase + recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git branch = 5.6 + project = WebKit.pro + priority = 20 [submodule "qtwebkit-examples"] + depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git branch = 5.6 [submodule "qtqa"] + depends = qtbase path = qtqa url = ../qtqa.git branch = master initrepo = true + priority = 50 [submodule "qtlocation"] + depends = qtbase + recommends = qtdeclarative qtquickcontrols qtserialport qtsystems path = qtlocation url = ../qtlocation.git branch = 5.6 initrepo = true [submodule "qtsensors"] + depends = qtbase + recommends = qtdeclarative path = qtsensors url = ../qtsensors.git branch = 5.6 initrepo = true [submodule "qtsystems"] + depends = qtbase + recommends = qtdeclarative path = qtsystems url = ../qtsystems.git branch = dev [submodule "qtfeedback"] + depends = qtdeclarative + recommends = qtmultimedia path = qtfeedback url = ../qtfeedback.git branch = master [submodule "qtdocgallery"] + depends = qtdeclarative path = qtdocgallery url = ../qtdocgallery.git branch = master [submodule "qtpim"] + depends = qtdeclarative path = qtpim url = ../qtpim.git branch = dev [submodule "qtconnectivity"] + depends = qtbase + recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git branch = 5.6 initrepo = true [submodule "qtwayland"] + depends = qtbase + recommends = qtdeclarative path = qtwayland url = ../qtwayland.git branch = 5.6 initrepo = true [submodule "qt3d"] + depends = qtdeclarative qtimageformats path = qt3d url = ../qt3d.git branch = 5.6 initrepo = true [submodule "qtimageformats"] + depends = qtbase path = qtimageformats url = ../qtimageformats.git branch = 5.6 initrepo = true [submodule "qtquick1"] + depends = qtscript + recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git branch = 5.6 [submodule "qtgraphicaleffects"] + depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git branch = 5.6 initrepo = true [submodule "qtquickcontrols"] + depends = qtdeclarative + recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git branch = 5.6 initrepo = true [submodule "qtserialbus"] + depends = qtserialport path = qtserialbus url = ../qtserialbus.git branch = 5.6 [submodule "qtserialport"] + depends = qtbase path = qtserialport url = ../qtserialport.git branch = 5.6 initrepo = true [submodule "qtx11extras"] + depends = qtbase path = qtx11extras url = ../qtx11extras.git branch = 5.6 initrepo = true [submodule "qtmacextras"] + depends = qtbase path = qtmacextras url = ../qtmacextras.git branch = 5.6 initrepo = true [submodule "qtwinextras"] + depends = qtbase + recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git branch = 5.6 initrepo = true [submodule "qtandroidextras"] + depends = qtbase path = qtandroidextras url = ../qtandroidextras.git branch = 5.6 initrepo = true [submodule "qtenginio"] + depends = qtdeclarative path = qtenginio url = ../qtenginio.git branch = 5.6 initrepo = true [submodule "qtwebsockets"] + depends = qtbase + recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git branch = 5.6 initrepo = true [submodule "qtwebchannel"] + depends = qtbase + recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git branch = 5.6 initrepo = true [submodule "qtwebengine"] + depends = qtquickcontrols qtwebchannel + recommends = qtlocation path = qtwebengine url = ../qtwebengine.git branch = 5.6 initrepo = true + priority = 10 [submodule "qtcanvas3d"] + depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git branch = 5.6 initrepo = true [submodule "qtwebview"] + depends = qtdeclarative + recommends = qtwebengine path = qtwebview url = ../qtwebview.git branch = 5.6 initrepo = true [submodule "qtquickcontrols2"] + depends = qtquickcontrols path = qtquickcontrols2 url = ../qtquickcontrols2.git branch = 5.6 initrepo = true [submodule "qtpurchasing"] + depends = qtbase + recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git branch = 5.6 -- cgit v1.2.3