summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2012-12-04 11:35:20 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-04 15:38:10 +0100
commit40d16a376a083f7b9ce90689cadcb606cc03991d (patch)
tree9bad7c238169b83269a04de1ad2f2ed150917d7b
parentd967ab094b7329ddfd5b3f6f1a42b6d5282dcf77 (diff)
sync.profile: Point dependencies to 'refs/heads/stable'v5.0.0-rc1
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: I0215dcb6759cdafe217d14cb61d87037a9e7d935 Reviewed-by: Janne Anttila <janne.anttila@digia.com>
-rw-r--r--sync.profile16
1 files changed, 8 insertions, 8 deletions
diff --git a/sync.profile b/sync.profile
index 5085139..0ffe6b2 100644
--- a/sync.profile
+++ b/sync.profile
@@ -5,12 +5,12 @@
# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
#
%dependencies = (
- "qtbase" => "refs/heads/master",
- "qtwebkit" => "refs/heads/master",
- "qtscript" => "refs/heads/master",
- "qtsvg" => "refs/heads/master",
- "qtxmlpatterns" => "refs/heads/master",
- "qtdeclarative" => "refs/heads/master",
- "qtjsbackend" => "refs/heads/master",
- "qttools" => "refs/heads/master",
+ "qtbase" => "refs/heads/stable",
+ "qtwebkit" => "refs/heads/stable",
+ "qtscript" => "refs/heads/stable",
+ "qtsvg" => "refs/heads/stable",
+ "qtxmlpatterns" => "refs/heads/stable",
+ "qtdeclarative" => "refs/heads/stable",
+ "qtjsbackend" => "refs/heads/stable",
+ "qttools" => "refs/heads/stable",
);