diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-12-12 23:16:14 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-13 17:30:46 +0100 |
| commit | a7ea2afffd61e2a89f7bb2c586b4b733c4996bb5 (patch) | |
| tree | ce395868098e60a659fd377bba705287e0e01564 /sync.profile | |
| parent | 9995a2910d8a5f0317fe3adeb54f838b99ab31a8 (diff) | |
sync.profile: Point dependencies to 'refs/heads/dev'wip/android
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: I15717ed1666bf939ddbe15c20df1858f480d60b7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'sync.profile')
| -rw-r--r-- | sync.profile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sync.profile b/sync.profile index e99b1d90..294aa256 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/dev", + "qtscript" => "refs/heads/dev", + "qtxmlpatterns" => "refs/heads/dev", + "qtdeclarative" => "refs/heads/dev", + "qtjsbackend" => "refs/heads/dev", + "qtactiveqt" => "refs/heads/dev", + "qttools" => "refs/heads/dev", + "qtwebkit" => "refs/heads/dev", ); |