diff options
author | Liang Qi <liang.qi@qt.io> | 2016-06-24 07:07:24 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-06-24 07:10:02 +0200 |
commit | 39a03d3d6a55cc676871caad674514afa274090d (patch) | |
tree | c35832f037e198d752782861580269f6d8ede39c /.gitmodules | |
parent | 7a8c8742316260fbb8304c4fde247ed05ae0b83d (diff) | |
parent | 3727ce11ac47a515d0d996220ca4de9adf67b26d (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I5ed83c8f42be099c545dfdcc96a34f7d33cfcda7
Diffstat (limited to '.gitmodules')
-rw-r--r-- | .gitmodules | 89 |
1 files changed, 50 insertions, 39 deletions
diff --git a/.gitmodules b/.gitmodules index d721c699..977a8947 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,72 +2,72 @@ path = qtbase url = ../qtbase.git branch = dev - initrepo = true + status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git branch = dev - initrepo = true + status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git branch = dev - initrepo = true + status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git branch = dev - initrepo = true + status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git branch = dev - initrepo = true + status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git branch = dev - initrepo = true + status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git branch = dev - initrepo = true + status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git branch = dev - initrepo = true + status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git branch = dev - initrepo = true + status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git branch = dev - initrepo = true + status = essential priority = 40 [submodule "qtrepotools"] path = qtrepotools url = ../qtrepotools.git branch = master - initrepo = true + status = essential qt = false [submodule "qtwebkit"] depends = qtbase @@ -75,6 +75,7 @@ path = qtwebkit url = ../qtwebkit.git branch = dev + status = obsolete project = WebKit.pro priority = 20 [submodule "qtwebkit-examples"] @@ -82,12 +83,13 @@ path = qtwebkit-examples url = ../qtwebkit-examples.git branch = dev + status = obsolete [submodule "qtqa"] depends = qtbase path = qtqa url = ../qtqa.git branch = master - initrepo = true + status = essential priority = 50 [submodule "qtlocation"] depends = qtbase @@ -95,207 +97,216 @@ path = qtlocation url = ../qtlocation.git branch = dev - initrepo = true + status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git branch = dev - initrepo = true + status = addon [submodule "qtsystems"] depends = qtbase recommends = qtdeclarative path = qtsystems url = ../qtsystems.git branch = dev + status = ignore [submodule "qtfeedback"] depends = qtdeclarative recommends = qtmultimedia path = qtfeedback url = ../qtfeedback.git branch = master + status = ignore [submodule "qtdocgallery"] depends = qtdeclarative path = qtdocgallery url = ../qtdocgallery.git branch = master + status = ignore [submodule "qtpim"] depends = qtdeclarative path = qtpim url = ../qtpim.git branch = dev + status = ignore [submodule "qtconnectivity"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git branch = dev - initrepo = true + status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git branch = dev - initrepo = true + status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats + recommends = qtgamepad path = qt3d url = ../qt3d.git branch = dev - initrepo = true + status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git branch = dev - initrepo = true + status = addon [submodule "qtquick1"] depends = qtscript recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git branch = dev + status = ignore [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git branch = dev - initrepo = true + status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git branch = dev - initrepo = true + status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git branch = dev + status = preview [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git branch = dev - initrepo = true + status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git branch = dev - initrepo = true + status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git branch = dev - initrepo = true + status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git branch = dev - initrepo = true + status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git branch = dev - initrepo = true + status = addon [submodule "qtenginio"] depends = qtdeclarative path = qtenginio url = ../qtenginio.git branch = dev - initrepo = true + status = ignore [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git branch = dev - initrepo = true + status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git branch = dev - initrepo = true + status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git branch = dev - initrepo = true + status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git branch = dev - initrepo = true + status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git branch = dev - initrepo = true + status = addon [submodule "qtquickcontrols2"] - depends = qtquickcontrols + depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git branch = dev - initrepo = true + status = addon [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git branch = dev - initrepo = true + status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git branch = dev - initrepo = true + status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git branch = dev - initrepo = true + status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = dev - initrepo = true + status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad branch = dev - initrepo = true + status = preview [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml branch = dev - initrepo = true + status = preview [submodule "qtspeech"] depends = qtbase + recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech branch = dev + status = ignore |