diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 16:20:02 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 16:20:18 +0100 |
| commit | 9322f9108ac03e7d7d7460a7bfb8227f86833998 (patch) | |
| tree | 8c5dc87f794509a41754d176f4253de80f50d1fe | |
| parent | 1faaf0d1e580b158971fd21c9881676ae5e7ed1e (diff) | |
| parent | 276c53531a95ce3f1f00c5c445e19584ac077917 (diff) | |
| download | qtwebkit-examples-9322f9108ac03e7d7d7460a7bfb8227f86833998.tar.gz | |
Merge branch 'release' into stable
Change-Id: I0ff240135fb13ed08f99eb1d2a7641210875feb4
| -rw-r--r-- | dist/changes-5.0.1 | 31 | ||||
| -rw-r--r-- | doc/qtwebkitexamples.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/doc/qtwebkitexamples.qdocconf b/doc/qtwebkitexamples.qdocconf index 5ae4a02..138cfab 100644 --- a/doc/qtwebkitexamples.qdocconf +++ b/doc/qtwebkitexamples.qdocconf @@ -12,7 +12,7 @@ version = 5.0.1 qhp.projects = QtWebKitExamples qhp.QtWebKitExamples.file = qtwebkitexamples.qhp -qhp.QtWebKitExamples.namespace = org.qt-project.qtwebkitexamples.500 +qhp.QtWebKitExamples.namespace = org.qt-project.qtwebkitexamples.501 qhp.QtWebKitExamples.indexTitle = Qt WebKit Examples qhp.QtWebKitExamples.virtualFolder = qtwebkitexamples qhp.QtWebKitExamples.indexRoot = |