diff options
| author | Jarek Kobus <jkobus@trolltech.com> | 2009-04-27 12:27:37 (GMT) |
|---|---|---|
| committer | Jarek Kobus <jkobus@trolltech.com> | 2009-04-27 12:27:37 (GMT) |
| commit | fa6b4a76291229f29b21063f1ee8d550aec8c48b (patch) | |
| tree | 53827b4eaeb564d7de37bdcb845c05af30d35f5f /tools/qdoc3/test/qmake.qdocconf | |
| parent | 96a27e24eec9356e45f1a6b6ff641a9afab24a39 (diff) | |
| parent | 63a4d6652aa8d84282083e49217120c97bb0bfc8 (diff) | |
| download | Qt-fa6b4a76291229f29b21063f1ee8d550aec8c48b.zip Qt-fa6b4a76291229f29b21063f1ee8d550aec8c48b.tar.gz Qt-fa6b4a76291229f29b21063f1ee8d550aec8c48b.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'tools/qdoc3/test/qmake.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/qmake.qdocconf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf index c357cfb..4e735b0 100644 --- a/tools/qdoc3/test/qmake.qdocconf +++ b/tools/qdoc3/test/qmake.qdocconf @@ -13,11 +13,11 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index qhp.projects = qmake qhp.qmake.file = qmake.qhp -qhp.qmake.namespace = com.trolltech.qmake.450 +qhp.qmake.namespace = com.trolltech.qmake.452 qhp.qmake.virtualFolder = qdoc qhp.qmake.indexTitle = QMake Manual qhp.qmake.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png -qhp.qmake.filterAttributes = qt 4.5.0 tools qmake +qhp.qmake.filterAttributes = qt 4.5.2 tools qmake qhp.qmake.customFilters.qmake.name = qmake Manual qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake qhp.qmake.subprojects = manual |