summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/qmake.qdocconf
diff options
context:
space:
mode:
Diffstat (limited to 'tools/qdoc3/test/qmake.qdocconf')
-rw-r--r--tools/qdoc3/test/qmake.qdocconf3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf
index 57299ae..62cd4ff 100644
--- a/tools/qdoc3/test/qmake.qdocconf
+++ b/tools/qdoc3/test/qmake.qdocconf
@@ -13,11 +13,12 @@ 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.451
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.6.0 tools qmake
+>>>>>>> 4.5:tools/qdoc3/test/qmake.qdocconf
qhp.qmake.customFilters.qmake.name = qmake Manual
qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake
qhp.qmake.subprojects = manual