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

Change-Id: I72d37aa6e543c0c93ea3bb743361b3e4938358fe

3 files changed, 28 insertions, 3 deletions

diff --git a/dist/changes-5.0.2 b/dist/changes-5.0.2
new file mode 100644
index 0000000..f29fa49
--- /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
+--------------------
+
+ - This release contains only minor code improvements.
diff --git a/src/scripttools/doc/qtscripttools.qdocconf b/src/scripttools/doc/qtscripttools.qdocconf
index 362fc61..6d409ca 100644
--- a/src/scripttools/doc/qtscripttools.qdocconf
+++ b/src/scripttools/doc/qtscripttools.qdocconf
@@ -32,11 +32,11 @@ qhp.qtscripttools.file = qtscripttools.qhp
 
 # Namespace for the output file. This namespace is used to distinguish between
 # different documentation files in Creator/Assistant.
-qhp.qtscripttools.namespace = org.qt-project.qtscripttools.501
+qhp.qtscripttools.namespace = org.qt-project.qtscripttools.$QT_VERSION_TAG
 
 # Title for the package, will be the main title for the package in
 # Assistant/Creator.
-qhp.qtscripttools.indexTitle = Qt Script
+qhp.qtscripttools.indexTitle = Qt Script Tools
 
 # Only update the name of the project for the next variables.
 qhp.qtscripttools.virtualFolder  = qtscripttools
diff --git a/sync.profile b/sync.profile
index 7067afc..914d962 100644
--- a/sync.profile
+++ b/sync.profile
@@ -11,6 +11,6 @@
 #   - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
 #
 %dependencies = (
-    "qtbase" => "refs/heads/stable",
+    "qtbase" => "refs/heads/old/5.0",
 );