summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2012-12-04 11:31:18 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-04 15:37:44 +0100
commit90c8ba233b77ed74012de3b5598a7617672e9d31 (patch)
tree39e89d03eb86eb765c82238154873f9afbba5e2f
parentd09f9443b64365f845f98283ccfd7b79a2930421 (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: I87e02c9d323b524898d93fb5d1d4387218a984c5 Reviewed-by: Janne Anttila <janne.anttila@digia.com>
-rw-r--r--sync.profile8
1 files changed, 4 insertions, 4 deletions
diff --git a/sync.profile b/sync.profile
index da532432..f33c9a8c 100644
--- a/sync.profile
+++ b/sync.profile
@@ -20,8 +20,8 @@
# - 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",
- "qtdeclarative" => "refs/heads/master",
- "qtjsbackend" => "refs/heads/master",
+ "qtbase" => "refs/heads/stable",
+ "qtxmlpatterns" => "refs/heads/stable",
+ "qtdeclarative" => "refs/heads/stable",
+ "qtjsbackend" => "refs/heads/stable",
);