diff options
| author | Oswald Buddenhagen <[email protected]> | 2013-04-11 16:57:34 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <[email protected]> | 2013-04-11 17:04:02 +0200 |
| commit | c51d26b6ec7869641441d01597c3e7acc643f93f (patch) | |
| tree | 69ee279e12be73ae385e087c9d89ce7bc8480446 /src/tools/qdoc/doc | |
| parent | 0646d1131b4bc65cdd9af29f4ce00fdd2398a3df (diff) | |
| parent | 967c18d29694fdeab858691a80cb8400fd02ec33 (diff) | |
Merge branch 'release' into old/5.0old/5.0
Conflicts:
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
Change-Id: Id635e0c27df5d8e3852d12bd6433c6463bf4eadc
Diffstat (limited to 'src/tools/qdoc/doc')
| -rw-r--r-- | src/tools/qdoc/doc/config/qdoc.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/qdoc/doc/config/qdoc.qdocconf b/src/tools/qdoc/doc/config/qdoc.qdocconf index 6bbe9347492..84e9689f50a 100644 --- a/src/tools/qdoc/doc/config/qdoc.qdocconf +++ b/src/tools/qdoc/doc/config/qdoc.qdocconf @@ -20,7 +20,7 @@ tagfile = ../html/qdoc.tags qhp.projects = QDoc qhp.QDoc.file = qdoc.qhp -qhp.QDoc.namespace = qdoc.$QT_VERSION_TAG +qhp.QDoc.namespace = org.qt-project.qdoc.$QT_VERSION_TAG qhp.QDoc.virtualFolder = qdoc qhp.QDoc.indexTitle = QDoc Manual qhp.QDoc.indexRoot = |