diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-12-12 23:51:41 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-13 22:39:20 +0100 |
| commit | b18f31c9aebd273fd58646dc484d44b91662fa7a (patch) | |
| tree | c10280a8260c31712005c1676a28fe682aa8af5a | |
| parent | d4c4a3e4fa3f20b46ecee5008b7de854109628e1 (diff) | |
| download | qttools-b18f31c9aebd273fd58646dc484d44b91662fa7a.tar.gz | |
sync.profile: Point dependencies to 'refs/heads/dev'
We should test dev branches against dev branches only by default.
At some point we should automate the merges from release->stable->dev
and/or decide how to handle possible conflicts.
This is good enough for the time being.
Change-Id: I40b8d45fa5f6106912ad0a5f9ae69fae7b9ec660
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | sync.profile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sync.profile b/sync.profile index a7c0427fc..2584076ff 100644 --- a/sync.profile +++ b/sync.profile @@ -16,10 +16,10 @@ # - 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", - "qtactiveqt" => "refs/heads/master", - "qtwebkit" => "refs/heads/master", + "qtbase" => "refs/heads/dev", + "qtxmlpatterns" => "refs/heads/dev", + "qtdeclarative" => "refs/heads/dev", + "qtjsbackend" => "refs/heads/dev", + "qtactiveqt" => "refs/heads/dev", + "qtwebkit" => "refs/heads/dev", ); |