From 3cfe8712ae4730e871fb6c1278f1b2bbc61c1c1b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 27 Jan 2016 16:03:59 +0100 Subject: [PATCH] fix branches of some modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Robert Loehning Reviewed-by: Simon Hausmann --- .gitmodules | 12 ++++++------ 1 file 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