diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 16:21:09 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 16:21:22 +0100 |
| commit | 9f90314a1e7a0f8d975716a6878e1e7abd5ad945 (patch) | |
| tree | e018cc5614a79b32a27e890b38a1a84f325dfa07 | |
| parent | 2bddbd5299c8b788c1f77ff65d0c744122af59e5 (diff) | |
| parent | 1bc407365d3cf61ecbfc7e3136d0b3bd8bc7fcb7 (diff) | |
| download | qtxmlpatterns-9f90314a1e7a0f8d975716a6878e1e7abd5ad945.tar.gz qtxmlpatterns-9f90314a1e7a0f8d975716a6878e1e7abd5ad945.tar.bz2 qtxmlpatterns-9f90314a1e7a0f8d975716a6878e1e7abd5ad945.zip | |
Merge branch 'release' into stable
Change-Id: I36ba2436d653e88a03fcb1e04658e50f8ad8392e
| -rw-r--r-- | dist/changes-5.0.1 | 31 | ||||
| -rw-r--r-- | src/xmlpatterns/doc/qtxmlpatterns.qdocconf | 2 |
2 files changed, 2 insertions, 31 deletions
diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1 index cc5a670..5fea7ba 100644 --- a/dist/changes-5.0.1 +++ b/dist/changes-5.0.1 @@ -19,33 +19,4 @@ information about a particular change. * General * **************************************************************************** -General Improvements --------------------- - -Third party components ----------------------- - -**************************************************************************** -* Library * -**************************************************************************** - - -**************************************************************************** -* Platform Specific Changes * -**************************************************************************** - - -**************************************************************************** -* Compiler Specific Changes * -**************************************************************************** - - -**************************************************************************** -* Tools * -**************************************************************************** - - -**************************************************************************** -* Plugins * -**************************************************************************** - + - This release contains only minor code improvements. diff --git a/src/xmlpatterns/doc/qtxmlpatterns.qdocconf b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf index 22e9af1..1db8656 100644 --- a/src/xmlpatterns/doc/qtxmlpatterns.qdocconf +++ b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf @@ -32,7 +32,7 @@ qhp.qtxmlpatterns.file = qtxmlpatterns.qhp # Namespace for the output file. This namespace is used to distinguish between # different documentation files in Creator/Assistant. -qhp.qtxmlpatterns.namespace = org.qt-project.qtxmlpatterns.500 +qhp.qtxmlpatterns.namespace = org.qt-project.qtxmlpatterns.501 # Title for the package, will be the main title for the package in # Assistant/Creator. |