diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-27 16:03:59 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-02-07 09:10:14 +0000 |
| commit | 3cfe8712ae4730e871fb6c1278f1b2bbc61c1c1b (patch) | |
| tree | f204e83b3cbc12097d8f9fca8162ecf599569af0 /.gitmodules | |
| parent | b680c074d1fc31e453ff3ec343ba8427fd2332ee (diff) | |
fix branches of some modules
all repos which are released (whichever way) need release branches.
and vice versa.
also, it needs to be the *right* release branch.
Task-number: QTBUG-50695
Change-Id: Id7b5d106d2d9bdf70e9d5276e205a3c7ea827144
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules index 4e2087b7..6f4cf63c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -74,7 +74,7 @@ recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git - branch = 5.6 + branch = 5.6.0 status = obsolete project = WebKit.pro priority = 20 @@ -82,7 +82,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.6 + branch = 5.6.0 status = obsolete [submodule "qtqa"] depends = qtbase @@ -162,7 +162,7 @@ recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git - branch = 5.6 + branch = 5.6.0 status = obsolete [submodule "qtgraphicaleffects"] depends = qtdeclarative @@ -181,7 +181,7 @@ depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.6 + branch = 5.6.0 status = preview [submodule "qtserialport"] depends = qtbase @@ -218,7 +218,7 @@ depends = qtdeclarative path = qtenginio url = ../qtenginio.git - branch = 1.6.0 + branch = 5.6.0 status = obsolete [submodule "qtwebsockets"] depends = qtbase @@ -266,5 +266,5 @@ recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.6 + branch = dev status = ignore |