Merge remote branch 'origin/2.1'

[qt-creator-jp/qt-creator-jp.git] / doc / qtcreator.qdocconf

diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf
index 0a3e8d6..1959c62 100644 (file)
--- a/doc/qtcreator.qdocconf
+++ b/doc/qtcreator.qdocconf
@@ -20,12 +20,12 @@ sources.fileextensions  = "qtcreator.qdoc maemodev.qdoc symbiandev.qdoc addressb
 
 qhp.projects            = QtCreator
 qhp.QtCreator.file             = qtcreator.qhp
-qhp.QtCreator.namespace        = com.nokia.qtcreator.2094
+qhp.QtCreator.namespace        = com.nokia.qtcreator.$QTC_VERSION_TAG
 qhp.QtCreator.virtualFolder    = doc
 qhp.QtCreator.indexTitle       = Qt Creator
-qhp.QtCreator.filterAttributes = qtcreator 2.0.94
-qhp.QtCreator.customFilters.QtCreator.name = Qt Creator 2.0.94
-qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator 2.0.94
+qhp.QtCreator.filterAttributes = qtcreator $QTC_VERSION
+qhp.QtCreator.customFilters.QtCreator.name = Qt Creator $QTC_VERSION
+qhp.QtCreator.customFilters.QtCreator.filterAttributes = qtcreator $QTC_VERSION
 qhp.QtCreator.indexRoot        =
 qhp.QtCreator.extraFiles       = style/style.css \
                           style/style_ie6.css \
@@ -66,6 +66,8 @@ qhp.QtCreator.subprojects.manual.type = manual
 
 # macros.qdocconf
 
+macro.qtcversion        = $QTC_VERSION
+
 macro.aring.HTML        = "å"
 macro.Auml.HTML         = "Ä"
 macro.author            = "\\bold{Author:}"