aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2012-12-04 11:26:08 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-04 12:25:25 +0100
commit460f310bcce2a5004d59eb7ae4b31a05c724e5ff (patch)
tree9b9195289eaecb3472befdfe89528db6014e49f8
parent97eb2bc244082f5634914e4a7d29f478ed8dc739 (diff)
sync.profile: Point dependencies to 'refs/heads/stable'
We should test stable branches against stable branches only. At some point we should automate the merges from dev->stable->release and decide how to handle possible merge conflicts. This is good enough for the time being. Change-Id: Idc68c5c4653375b1805638b80c2a9e8f5a2cacad Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com>
-rw-r--r--sync.profile6
1 files changed, 3 insertions, 3 deletions
diff --git a/sync.profile b/sync.profile
index d65c740a66..bddfd0f7f3 100644
--- a/sync.profile
+++ b/sync.profile
@@ -17,7 +17,7 @@
# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
#
%dependencies = (
- "qtbase" => "refs/heads/master",
- "qtxmlpatterns" => "refs/heads/master",
- "qtjsbackend" => "refs/heads/master",
+ "qtbase" => "refs/heads/stable",
+ "qtxmlpatterns" => "refs/heads/stable",
+ "qtjsbackend" => "refs/heads/stable",
);