diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-12-04 11:32:00 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-04 16:01:48 +0100 |
| commit | 05fcd25dd1db9cf5f5e7bfcbebb67a1d3b834733 (patch) | |
| tree | bfcab18612eeeb994a093b287e73e0b95084e96e | |
| parent | f93bc7fabd380cf10be7f90903ace618074dc871 (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: Ic8e80a8db60c8fae950e1327bc8ac66c1940872d
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
| -rw-r--r-- | sync.profile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sync.profile b/sync.profile index e99b1d90..9ad1263a 100644 --- a/sync.profile +++ b/sync.profile @@ -8,12 +8,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", - "qtscript" => "refs/heads/master", - "qtxmlpatterns" => "refs/heads/master", - "qtdeclarative" => "refs/heads/master", - "qtjsbackend" => "refs/heads/master", - "qtactiveqt" => "refs/heads/master", - "qttools" => "refs/heads/master", - "qtwebkit" => "refs/heads/master", + "qtbase" => "refs/heads/stable", + "qtscript" => "refs/heads/stable", + "qtxmlpatterns" => "refs/heads/stable", + "qtdeclarative" => "refs/heads/stable", + "qtjsbackend" => "refs/heads/stable", + "qtactiveqt" => "refs/heads/stable", + "qttools" => "refs/heads/stable", + "qtwebkit" => "refs/heads/stable", ); |