Adjust submodule branches

Change-Id: I3457cdb3ec2a645fb542039a62e6d107e1bbb812
This commit is contained in:
Oswald Buddenhagen
2016-05-13 13:28:52 +02:00
parent 777967f97b
commit 23824d231b

80
.gitmodules vendored
View File

@@ -1,66 +1,66 @@
[submodule "qtbase"] [submodule "qtbase"]
path = qtbase path = qtbase
url = ../qtbase.git url = ../qtbase.git
branch = 5.7 branch = 5.7.0
status = essential status = essential
[submodule "qtsvg"] [submodule "qtsvg"]
depends = qtbase depends = qtbase
path = qtsvg path = qtsvg
url = ../qtsvg.git url = ../qtsvg.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtdeclarative"] [submodule "qtdeclarative"]
depends = qtbase depends = qtbase
recommends = qtsvg qtxmlpatterns recommends = qtsvg qtxmlpatterns
path = qtdeclarative path = qtdeclarative
url = ../qtdeclarative.git url = ../qtdeclarative.git
branch = 5.7 branch = 5.7.0
status = essential status = essential
[submodule "qtactiveqt"] [submodule "qtactiveqt"]
depends = qtbase depends = qtbase
path = qtactiveqt path = qtactiveqt
url = ../qtactiveqt.git url = ../qtactiveqt.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtscript"] [submodule "qtscript"]
depends = qtbase depends = qtbase
recommends = qttools recommends = qttools
path = qtscript path = qtscript
url = ../qtscript.git url = ../qtscript.git
branch = 5.7 branch = 5.7.0
status = deprecated status = deprecated
[submodule "qtmultimedia"] [submodule "qtmultimedia"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtmultimedia path = qtmultimedia
url = ../qtmultimedia.git url = ../qtmultimedia.git
branch = 5.7 branch = 5.7.0
status = essential status = essential
[submodule "qttools"] [submodule "qttools"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtactiveqt qtwebkit recommends = qtdeclarative qtactiveqt qtwebkit
path = qttools path = qttools
url = ../qttools.git url = ../qttools.git
branch = 5.7 branch = 5.7.0
status = essential status = essential
[submodule "qtxmlpatterns"] [submodule "qtxmlpatterns"]
depends = qtbase depends = qtbase
path = qtxmlpatterns path = qtxmlpatterns
url = ../qtxmlpatterns.git url = ../qtxmlpatterns.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qttranslations"] [submodule "qttranslations"]
depends = qttools depends = qttools
path = qttranslations path = qttranslations
url = ../qttranslations.git url = ../qttranslations.git
branch = 5.7 branch = 5.7.0
status = essential status = essential
priority = 30 priority = 30
[submodule "qtdoc"] [submodule "qtdoc"]
depends = qtdeclarative depends = qtdeclarative
path = qtdoc path = qtdoc
url = ../qtdoc.git url = ../qtdoc.git
branch = 5.7 branch = 5.7.0
status = essential status = essential
priority = 40 priority = 40
[submodule "qtrepotools"] [submodule "qtrepotools"]
@@ -74,7 +74,7 @@
recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
path = qtwebkit path = qtwebkit
url = ../qtwebkit.git url = ../qtwebkit.git
branch = 5.7 branch = 5.7.0
status = obsolete status = obsolete
project = WebKit.pro project = WebKit.pro
priority = 20 priority = 20
@@ -82,7 +82,7 @@
depends = qtwebkit qttools depends = qtwebkit qttools
path = qtwebkit-examples path = qtwebkit-examples
url = ../qtwebkit-examples.git url = ../qtwebkit-examples.git
branch = 5.7 branch = 5.7.0
status = obsolete status = obsolete
[submodule "qtqa"] [submodule "qtqa"]
depends = qtbase depends = qtbase
@@ -96,14 +96,14 @@
recommends = qtdeclarative qtquickcontrols qtserialport qtsystems recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
path = qtlocation path = qtlocation
url = ../qtlocation.git url = ../qtlocation.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtsensors"] [submodule "qtsensors"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtsensors path = qtsensors
url = ../qtsensors.git url = ../qtsensors.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtsystems"] [submodule "qtsystems"]
depends = qtbase depends = qtbase
@@ -136,172 +136,172 @@
recommends = qtdeclarative qtandroidextras recommends = qtdeclarative qtandroidextras
path = qtconnectivity path = qtconnectivity
url = ../qtconnectivity.git url = ../qtconnectivity.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtwayland"] [submodule "qtwayland"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtwayland path = qtwayland
url = ../qtwayland.git url = ../qtwayland.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qt3d"] [submodule "qt3d"]
depends = qtdeclarative qtimageformats depends = qtdeclarative qtimageformats
recommends = qtgamepad recommends = qtgamepad
path = qt3d path = qt3d
url = ../qt3d.git url = ../qt3d.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtimageformats"] [submodule "qtimageformats"]
depends = qtbase depends = qtbase
path = qtimageformats path = qtimageformats
url = ../qtimageformats.git url = ../qtimageformats.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtquick1"] [submodule "qtquick1"]
depends = qtscript depends = qtscript
recommends = qtsvg qtxmlpatterns recommends = qtsvg qtxmlpatterns
path = qtquick1 path = qtquick1
url = ../qtquick1.git url = ../qtquick1.git
branch = 5.7 branch = 5.7.0
status = obsolete status = obsolete
[submodule "qtgraphicaleffects"] [submodule "qtgraphicaleffects"]
depends = qtdeclarative depends = qtdeclarative
path = qtgraphicaleffects path = qtgraphicaleffects
url = ../qtgraphicaleffects.git url = ../qtgraphicaleffects.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtquickcontrols"] [submodule "qtquickcontrols"]
depends = qtdeclarative depends = qtdeclarative
recommends = qtgraphicaleffects recommends = qtgraphicaleffects
path = qtquickcontrols path = qtquickcontrols
url = ../qtquickcontrols.git url = ../qtquickcontrols.git
branch = 5.7 branch = 5.7.0
status = essential status = essential
[submodule "qtserialbus"] [submodule "qtserialbus"]
depends = qtserialport depends = qtserialport
path = qtserialbus path = qtserialbus
url = ../qtserialbus.git url = ../qtserialbus.git
branch = 5.7 branch = 5.7.0
status = preview status = preview
[submodule "qtserialport"] [submodule "qtserialport"]
depends = qtbase depends = qtbase
path = qtserialport path = qtserialport
url = ../qtserialport.git url = ../qtserialport.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtx11extras"] [submodule "qtx11extras"]
depends = qtbase depends = qtbase
path = qtx11extras path = qtx11extras
url = ../qtx11extras.git url = ../qtx11extras.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtmacextras"] [submodule "qtmacextras"]
depends = qtbase depends = qtbase
path = qtmacextras path = qtmacextras
url = ../qtmacextras.git url = ../qtmacextras.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtwinextras"] [submodule "qtwinextras"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtwinextras path = qtwinextras
url = ../qtwinextras.git url = ../qtwinextras.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtandroidextras"] [submodule "qtandroidextras"]
depends = qtbase depends = qtbase
path = qtandroidextras path = qtandroidextras
url = ../qtandroidextras.git url = ../qtandroidextras.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtenginio"] [submodule "qtenginio"]
depends = qtdeclarative depends = qtdeclarative
path = qtenginio path = qtenginio
url = ../qtenginio.git url = ../qtenginio.git
branch = 5.7 branch = 5.7.0
status = obsolete status = obsolete
[submodule "qtwebsockets"] [submodule "qtwebsockets"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtwebsockets path = qtwebsockets
url = ../qtwebsockets.git url = ../qtwebsockets.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtwebchannel"] [submodule "qtwebchannel"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtwebsockets recommends = qtdeclarative qtwebsockets
path = qtwebchannel path = qtwebchannel
url = ../qtwebchannel.git url = ../qtwebchannel.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtwebengine"] [submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel depends = qtquickcontrols qtwebchannel
recommends = qtlocation recommends = qtlocation
path = qtwebengine path = qtwebengine
url = ../qtwebengine.git url = ../qtwebengine.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
priority = 10 priority = 10
[submodule "qtcanvas3d"] [submodule "qtcanvas3d"]
depends = qtdeclarative depends = qtdeclarative
path = qtcanvas3d path = qtcanvas3d
url = ../qtcanvas3d.git url = ../qtcanvas3d.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtwebview"] [submodule "qtwebview"]
depends = qtdeclarative depends = qtdeclarative
recommends = qtwebengine recommends = qtwebengine
path = qtwebview path = qtwebview
url = ../qtwebview.git url = ../qtwebview.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtquickcontrols2"] [submodule "qtquickcontrols2"]
depends = qtgraphicaleffects depends = qtgraphicaleffects
path = qtquickcontrols2 path = qtquickcontrols2
url = ../qtquickcontrols2.git url = ../qtquickcontrols2.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtpurchasing"] [submodule "qtpurchasing"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtpurchasing path = qtpurchasing
url = ../qtpurchasing.git url = ../qtpurchasing.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtcharts"] [submodule "qtcharts"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtcharts path = qtcharts
url = ../qtcharts.git url = ../qtcharts.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtdatavis3d"] [submodule "qtdatavis3d"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtdatavis3d path = qtdatavis3d
url = ../qtdatavis3d.git url = ../qtdatavis3d.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtvirtualkeyboard"] [submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git url = ../qtvirtualkeyboard.git
branch = 5.7 branch = 5.7.0
status = addon status = addon
[submodule "qtgamepad"] [submodule "qtgamepad"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtgamepad path = qtgamepad
url = ../qtgamepad url = ../qtgamepad
branch = 5.7 branch = 5.7.0
status = preview status = preview
[submodule "qtscxml"] [submodule "qtscxml"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtscxml path = qtscxml
url = ../qtscxml url = ../qtscxml
branch = 5.7 branch = 5.7.0
status = preview status = preview
[submodule "qtspeech"] [submodule "qtspeech"]
depends = qtbase depends = qtbase