Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	.qmake.conf
	sync.profile

Change-Id: Ica3851cfaa4844644fbbe83c2e3c58803f170501

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" => "",
 );