From fbd782636b6ee413d2b6e8bca408263297194254 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 19 Oct 2016 12:06:20 +0200 Subject: Clean up usage of qtsvg as dependency There is no build dependency on QtSvg in qtdeclarative or qtquick1, so don't recommend it for builds. QtSensors on the other hand has an example that does need svg. This does not change anything in the big picture, the svg module will be built as always and svg files will be displayed. The change is the ordering of builds (leave more room for parallelization). Change-Id: I50e527e03a75742036d5f914611d0b34437a8e3a Reviewed-by: Oswald Buddenhagen --- .gitmodules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index 9bcdf4ce..6dc85870 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,7 +11,7 @@ status = addon [submodule "qtdeclarative"] depends = qtbase - recommends = qtsvg qtxmlpatterns + recommends = qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git branch = 5.6 @@ -100,7 +100,7 @@ status = addon [submodule "qtsensors"] depends = qtbase - recommends = qtdeclarative + recommends = qtdeclarative qtsvg path = qtsensors url = ../qtsensors.git branch = 5.6 @@ -159,7 +159,7 @@ status = addon [submodule "qtquick1"] depends = qtscript - recommends = qtsvg qtxmlpatterns + recommends = qtxmlpatterns path = qtquick1 url = ../qtquick1.git branch = 5.6 -- cgit v1.2.1 From bf4f3a434a1e7dee240a40947b321fe98d0fb725 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 21 Nov 2016 12:48:41 +0100 Subject: Adjust submodule branches Change-Id: I154feb1976da9853cb4de7e70a4962ad0a6b4067 --- .gitmodules | 80 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) (limited to '.gitmodules') diff --git a/.gitmodules b/.gitmodules index f044480c..b7825aa5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.8 + branch = 5.8.0 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.8 + branch = 5.8.0 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.8 + branch = 5.8.0 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.8 + branch = 5.8.0 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = 5.8 + branch = 5.8.0 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.8 + branch = 5.8.0 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.8 + branch = 5.8.0 status = essential priority = 40 [submodule "qtrepotools"] @@ -74,7 +74,7 @@ recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git - branch = 5.8 + branch = 5.8.0 status = obsolete project = WebKit.pro priority = 20 @@ -82,7 +82,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.8 + branch = 5.8.0 status = obsolete [submodule "qtqa"] depends = qtbase @@ -96,14 +96,14 @@ recommends = qtdeclarative qtquickcontrols qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtsystems"] depends = qtbase @@ -136,27 +136,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats recommends = qtgamepad path = qt3d url = ../qt3d.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtquick1"] depends = qtscript @@ -169,51 +169,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.8 + branch = 5.8.0 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -226,94 +226,94 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git - branch = 5.8 + branch = 5.8.0 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad - branch = 5.8 + branch = 5.8.0 status = preview [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml - branch = 5.8 + branch = 5.8.0 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech - branch = 5.8 + branch = 5.8.0 status = preview [submodule "qtnetworkauth"] depends = qtbase recommends = qtwebview path = qtnetworkauth url = ../qtnetworkauth - branch = 5.8 + branch = 5.8.0 status = preview -- cgit v1.2.1