summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/linguist.qdocconf
diff options
context:
space:
mode:
Diffstat (limited to 'tools/qdoc3/test/linguist.qdocconf')
-rw-r--r--tools/qdoc3/test/linguist.qdocconf3
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf
index beff2da..9a9c5b0 100644
--- a/tools/qdoc3/test/linguist.qdocconf
+++ b/tools/qdoc3/test/linguist.qdocconf
@@ -13,11 +13,12 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index
qhp.projects = Linguist
qhp.Linguist.file = linguist.qhp
-qhp.Linguist.namespace = com.trolltech.linguist.450
+qhp.Linguist.namespace = com.trolltech.linguist.451
qhp.Linguist.virtualFolder = qdoc
qhp.Linguist.indexTitle = Qt Linguist Manual
qhp.Linguist.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png
qhp.Linguist.filterAttributes = qt 4.6.0 tools linguist
+>>>>>>> 4.5:tools/qdoc3/test/linguist.qdocconf
qhp.Linguist.customFilters.Linguist.name = Qt Linguist Manual
qhp.Linguist.customFilters.Linguist.filterAttributes = qt tools linguist
qhp.Linguist.subprojects = manual examples