diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 16:04:57 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-03 16:04:57 +0200 |
| commit | c10701b8fb3b20998f719da2c536e9a09bea0f00 (patch) | |
| tree | b01c0718e058d0a4f3eb30f473ce814723e52d6b | |
| parent | 5d5f61912d4352e58d58fe8cf5fe1dd58b04b9e5 (diff) | |
| parent | 59c342572fc2cda2cd53ae60f215c095083bbf58 (diff) | |
| download | qtscript-c10701b8fb3b20998f719da2c536e9a09bea0f00.tar.gz | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I25b38558ad6515197114831b43a756d4edce6ee9
| -rw-r--r-- | dist/changes-5.0.2 | 25 | ||||
| -rw-r--r-- | src/scripttools/doc/qtscripttools.qdocconf | 4 |
2 files changed, 27 insertions, 2 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 |