Adapt api.pro to generate the dev document.

diff --git a/doc/api/api.pro b/doc/api/api.pro
index ea99296..aba8fb4 100644 (file)
--- a/doc/api/api.pro
+++ b/doc/api/api.pro
@@ -21,23 +21,30 @@ isEmpty(vcproj) {
     QMAKE_EXTRA_COMPILERS += phony_src
 }
 
+include(../../qtcreator.pri)
+QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc3)
+HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator)
+
+VERSION_TAG = $$replace(QTCREATOR_VERSION, "[-.]", )
 
-QDOC_BIN = $$[QT_INSTALL_BINS]/qdoc3
 equals(QMAKE_DIR_SEP, /) {   # unix, mingw+msys
-    QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/html $$QDOC_BIN
+    QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html QTC_VERSION=$$QTCREATOR_VERSION QTC_VERSION_TAG=$$VERSION_TAG $$QDOC_BIN
 } else:win32-g++* {   # just mingw
     # The lack of spaces in front of the && is necessary!
-    QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/html&& $$QDOC_BIN
+    QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& set QTC_VERSION=$$QTCREATOR_VERSION&& set QTC_VERSION_TAG=$$VERSION_TAG&& $$QDOC_BIN
 } else {   # nmake
     QDOC = set SRCDIR=$$PWD $$escape_expand(\\n\\t) \
-           set OUTDIR=$$OUT_PWD/html $$escape_expand(\\n\\t) \
+           set OUTDIR=$$OUT_PWD/doc/html $$escape_expand(\\n\\t) \
+           set QTC_VERSION=$$QTCREATOR_VERSION $$escape_expand(\\n\\t) \
+           set QTC_VERSION_TAG=$$VERSION_TAG $$escape_expand(\\n\\t) \
            $$QDOC_BIN
 }
 
-HELP_FILES     = $$PWD/qtcreator-api.qdocconf
+HELP_FILES     = $$PWD/qtcreator-dev.qdocconf
 HELP_DEP_FILES = $$PWD/qtcreator-api.qdoc \
                  $$PWD/coding-style.qdoc \
-                 $$PWD/qtcreator-api.qdocconf
+                 $$PWD/qtcreator-dev.qdoc \
+                 $$PWD/qtcreator-dev.qdocconf
 
 docs.name = CREATE API DOC
 docs.input = HELP_FILES