Merge branch 'release' into old/5.0old/5.0

Change-Id: I33fe2ccab89e8e68e05cc6bbd69b7521fdc933dd

3 files changed, 33 insertions, 8 deletions

diff --git a/dist/changes-5.0.2 b/dist/changes-5.0.2
new file mode 100644
index 000000000..a370dfdcc
--- /dev/null
+++ b/dist/changes-5.0.2
@@ -0,0 +1,25 @@
+Qt 5.0.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.0.0 and 5.0.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.0/
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+ - Documentation: Fixed several missing information or incorrect information.
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index 641921113..52c710088 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -91,7 +91,7 @@
         \li \l{Qt XML Patterns C++ Classes}{QtXmlPatterns}
         \li \l{Qt Svg C++ Classes}{QtSvg}
         \li \l{Qt Concurrent C++ Classes}{QtConcurrent}
-        \li \l{Qt Print Support Module}{QtPrintSupport}
+        \li \l{Qt Print Support C++ Classes}{QtPrintSupport}
     \row
         \li \l{Qt D-Bus C++ Classes}{QtDBus}
         \li \l{QtOpenGL Module}{QtOpenGL}
diff --git a/sync.profile b/sync.profile
index 6d3be16ac..c2e8e98dc 100644
--- a/sync.profile
+++ b/sync.profile
@@ -5,11 +5,11 @@
 #   - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
 #
 %dependencies = (
-    "qtbase" => "refs/heads/stable",
-    "qtscript" => "refs/heads/stable",
-    "qtsvg" => "refs/heads/stable",
-    "qtxmlpatterns" => "refs/heads/stable",
-    "qttools" => "refs/heads/stable",
-    "qtdeclarative" => "refs/heads/stable",
-    "qtjsbackend" => "refs/heads/stable",
+    "qtbase" => "refs/heads/old/5.0",
+    "qtscript" => "refs/heads/old/5.0",
+    "qtsvg" => "refs/heads/old/5.0",
+    "qtxmlpatterns" => "refs/heads/old/5.0",
+    "qttools" => "refs/heads/old/5.0",
+    "qtdeclarative" => "refs/heads/old/5.0",
+    "qtjsbackend" => "refs/heads/old/5.0",
 );