diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:44:48 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:44:48 +0200 |
commit | b006ef73e5b27702d3c43f52543fc1f34300fe0e (patch) | |
tree | e39e090c9b4dc4f8a4d3e32c36c959c316861bfc | |
parent | bb7c0257bfe3ab1478c74365476f5da72489cd2e (diff) | |
parent | c4254a0599ed104608cdc1a94561a9fda7db2918 (diff) | |
download | qtgraphicaleffects-b006ef73e5b27702d3c43f52543fc1f34300fe0e.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: Ica3851cfaa4844644fbbe83c2e3c58803f170501
-rw-r--r-- | sync.profile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sync.profile b/sync.profile index ee33467..658eaf2 100644 --- a/sync.profile +++ b/sync.profile @@ -3,10 +3,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" => "refs/heads/dev", - "qtdeclarative" => "refs/heads/dev", - "qtjsbackend" => "refs/heads/dev", - "qtxmlpatterns" => "refs/heads/dev", + "qtbase" => "", + "qtdeclarative" => "", + "qtjsbackend" => "", + "qtxmlpatterns" => "", ); |