diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-11-22 02:48:52 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-11-22 02:48:52 (GMT) |
| commit | 42c29941271e6ab6304c23859b4b4fa70a6978bd (patch) | |
| tree | 0ab2283a03bf0b3b2afaa92cbb397a0454f13f66 /tools/qdoc3 | |
| parent | 45d97f42992095f5f6c1a743bbefe5d85fe2bd26 (diff) | |
| parent | 538e7b8ddf45936bb274ed3230b591b3459edfa7 (diff) | |
| download | Qt-42c29941271e6ab6304c23859b4b4fa70a6978bd.zip Qt-42c29941271e6ab6304c23859b4b4fa70a6978bd.tar.gz Qt-42c29941271e6ab6304c23859b4b4fa70a6978bd.tar.bz2 | |
Merge remote branch 'qt/master'
Conflicts:
tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'tools/qdoc3')
| -rw-r--r-- | tools/qdoc3/test/qt.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf index 0e8ac8c..b7b5371 100644 --- a/tools/qdoc3/test/qt.qdocconf +++ b/tools/qdoc3/test/qt.qdocconf @@ -62,7 +62,7 @@ qhp.Qt.extraFiles = index.html \ qhp.Qt.filterAttributes = qt 4.8.0 qtrefdoc qhp.Qt.customFilters.Qt.name = Qt 4.8.0 qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.0 -qhp.Qt.subprojects = classes overviews examples +qhp.Qt.subprojects = classes qmlelements overviews examples qhp.Qt.subprojects.classes.title = Classes qhp.Qt.subprojects.classes.indexTitle = Qt's Classes qhp.Qt.subprojects.classes.selectors = class fake:headerfile |