diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-11-30 17:44:23 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-11-30 17:44:23 (GMT) |
| commit | 39fde39430870467c41fbddd79b2b2d8788e45e2 (patch) | |
| tree | aa3a7e99604e0f4eb4b6e95ee28a9824fe8023bc /tools/qdoc3/test/designer.qdocconf | |
| parent | 88a86d8e2c82edf53b56afcc2f80fffd32a18e49 (diff) | |
| parent | 1cbae5156277887bff3328304381d3436438a1ad (diff) | |
| download | Qt-39fde39430870467c41fbddd79b2b2d8788e45e2.zip Qt-39fde39430870467c41fbddd79b2b2d8788e45e2.tar.gz Qt-39fde39430870467c41fbddd79b2b2d8788e45e2.tar.bz2 | |
Merge branch '4.7' into qdoc-simplified
Conflicts:
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/htmlgenerator.h
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf
tools/qdoc3/test/qt_zh_CN.qdocconf
Diffstat (limited to 'tools/qdoc3/test/designer.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/designer.qdocconf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf index ab66792..637399b 100644 --- a/tools/qdoc3/test/designer.qdocconf +++ b/tools/qdoc3/test/designer.qdocconf @@ -13,7 +13,7 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = Designer qhp.Designer.file = designer.qhp -qhp.Designer.namespace = com.trolltech.designer.471 +qhp.Designer.namespace = com.trolltech.designer.472 qhp.Designer.virtualFolder = qdoc qhp.Designer.indexTitle = Qt Designer Manual qhp.Designer.extraFiles = images/bg_l.png \ @@ -50,7 +50,7 @@ qhp.Designer.extraFiles = images/bg_l.png \ style/style_ie8.css \ style/style.css -qhp.Designer.filterAttributes = qt 4.7.1 tools designer +qhp.Designer.filterAttributes = qt 4.7.2 tools designer qhp.Designer.customFilters.Designer.name = Qt Designer Manual qhp.Designer.customFilters.Designer.filterAttributes = qt tools designer qhp.Designer.subprojects = manual examples |