summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/assistant.qdocconf
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2009-04-21 21:03:06 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2009-04-21 21:03:06 (GMT)
commitdb4e2a600c53ad857d7fa3f7d84ac995215ecf93 (patch)
tree88ca89842925080cf18eb9f796310a89216828b0 /tools/qdoc3/test/assistant.qdocconf
parent4f64ff3e8902529700336c7ad3aa9fccf5ca3e0b (diff)
parentc36ff16f66ffd65839ba1e254ac557e491db6bf4 (diff)
downloadQt-db4e2a600c53ad857d7fa3f7d84ac995215ecf93.zip
Qt-db4e2a600c53ad857d7fa3f7d84ac995215ecf93.tar.gz
Qt-db4e2a600c53ad857d7fa3f7d84ac995215ecf93.tar.bz2
Merge branch '4.5'
Conflicts: src/gui/graphicsview/qgraphicsitem.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'tools/qdoc3/test/assistant.qdocconf')
-rw-r--r--tools/qdoc3/test/assistant.qdocconf2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf
index 9ba1b14..c023c51 100644
--- a/tools/qdoc3/test/assistant.qdocconf
+++ b/tools/qdoc3/test/assistant.qdocconf
@@ -13,7 +13,7 @@ indexes = $QT_BUILD_TREE/doc-build/html-qt/qt.index
qhp.projects = Assistant
qhp.Assistant.file = assistant.qhp
-qhp.Assistant.namespace = com.trolltech.assistant.450
+qhp.Assistant.namespace = com.trolltech.assistant.451
qhp.Assistant.virtualFolder = qdoc
qhp.Assistant.indexTitle = Qt Assistant Manual
qhp.Assistant.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png