diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-04-11 21:14:40 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-04-11 21:14:56 +0200 |
| commit | c97b603fa2274f807ce2d6374e965dbc93641c91 (patch) | |
| tree | fe30f2a789d333d4bea6f635f7eadc89074854fb | |
| parent | 6a66dbdddb6abd302898122b135513e95f659031 (diff) | |
| parent | 9799ca408839612de9f5dd79fbaa8ef405d26a27 (diff) | |
| download | qtscript-c97b603fa2274f807ce2d6374e965dbc93641c91.tar.gz | |
Merge branch 'stable' into dev
Change-Id: I5d118c809890a7179791085b7514434e339bd7c6
| -rw-r--r-- | dist/changes-5.0.2 | 25 | ||||
| -rw-r--r-- | src/scripttools/doc/qtscripttools.qdocconf | 4 | ||||
| -rw-r--r-- | tests/auto/cmake/cmake.pro | 1 |
3 files changed, 28 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 diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro index 6a28b36..f8ad524 100644 --- a/tests/auto/cmake/cmake.pro +++ b/tests/auto/cmake/cmake.pro @@ -3,5 +3,6 @@ TEMPLATE = subdirs CMAKE_QT_MODULES_UNDER_TEST = script +qtHaveModule(widgets): CMAKE_QT_MODULES_UNDER_TEST += scripttools CONFIG += ctest_testcase |