summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2013-09-20 15:01:57 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-20 17:35:28 +0200
commit0efdadaa3f7226181ffbd968f628107da91ce931 (patch)
treeaee9d284b36bfd098499725f76d1b99caaac59ff
parent49994fb2ad1dbc66d69b7d5d3418ade4dde7213f (diff)
downloadqtwebkit-0efdadaa3f7226181ffbd968f628107da91ce931.tar.gz
[Qt] Update sync.profile https://bugs.webkit.org/show_bug.cgi?id=121295
Reviewed by Simon Hausmann. Ensure we let the dependencies pick the right branch instead of always master and list all the dependencies we need on all platforms. * Source/sync.profile: Change-Id: Ia6f2d55911eb18c4ecacac017439afe78db5f17c git-svn-id: http://svn.webkit.org/repository/webkit/trunk@155694 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
-rw-r--r--Source/sync.profile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/sync.profile b/Source/sync.profile
index 3696fa21f..53063aaa3 100644
--- a/Source/sync.profile
+++ b/Source/sync.profile
@@ -15,9 +15,11 @@
# Each of the module version specifiers can take one of the following values:
# - A specific Git revision.
# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
+# - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch)
#
%dependencies = (
"qtbase" => "",
- "qtxmlpatterns" => "",
"qtdeclarative" => "",
+ "qtmultimedia" => "",
+ "qtsensors" => "",
);