diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-05 14:18:08 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-05 14:18:08 +0100 |
| commit | a409a24cab4b703fe1e572096f0191b61270e13d (patch) | |
| tree | 051d35b2fdebd2709a87530da05036a628aa9d1b | |
| parent | a34f4dcb275f383d073fea11457e5bf88c199dee (diff) | |
| parent | 9322f9108ac03e7d7d7460a7bfb8227f86833998 (diff) | |
| download | qtwebkit-examples-a409a24cab4b703fe1e572096f0191b61270e13d.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I97a3851c17a6aa854679f9244684feeb2ef49a79
| -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 = |