slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sync.profile: Point dependencies to 'refs/heads/dev'

Browse Source 
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: I9f3c9977b162b82611e48cd304cfcc316fed95ad
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
This commit is contained in:
Sergio Ahumada
2012-12-12 22:22:38 +01:00
committed by The Qt Project
parent 6a6c9ca37c
commit c2736c3a62
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sync.profile
View File

@@ -20,8 +20,8 @@
# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
# #
%dependencies = ( %dependencies = (
"qtbase" => "refs/heads/master", "qtbase" => "refs/heads/dev",
"qtxmlpatterns" => "refs/heads/master", "qtxmlpatterns" => "refs/heads/dev",
"qtdeclarative" => "refs/heads/master", "qtdeclarative" => "refs/heads/dev",
"qtjsbackend" => "refs/heads/master", "qtjsbackend" => "refs/heads/dev",
); );