diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-12-12 22:11:54 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-13 14:23:44 +0100 |
| commit | 04a49468fda65936c0b6b349266bf029d8041212 (patch) | |
| tree | 2ea221453f9a57aad55f800a4e25e32bb1e51351 | |
| parent | 447dfbcde77214aacfe940120fcfeb1af06cdeb9 (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: Ie5e27d7f65f6c306acb71c89b769600a46fe1150
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | sync.profile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sync.profile b/sync.profile index 7a7b549..ee33467 100644 --- a/sync.profile +++ b/sync.profile @@ -5,8 +5,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", - "qtdeclarative" => "refs/heads/master", - "qtjsbackend" => "refs/heads/master", - "qtxmlpatterns" => "refs/heads/master", + "qtbase" => "refs/heads/dev", + "qtdeclarative" => "refs/heads/dev", + "qtjsbackend" => "refs/heads/dev", + "qtxmlpatterns" => "refs/heads/dev", ); |