qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove hardcoded qdoc3 command from qtdeclarative_doc.pri 

Previously, this called qdoc3 directly, which could fail if the system
path had a pre-existing qdoc3 of a different version.

Change-Id: If68e00fd60594590d40f11b08416f220f0806bfb
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Peter Yard <peter.yard@nokia.com>
This commit is contained in:
Chris Adams 2012-06-19 16:41:35 +10:00 committed by Qt by Nokia
parent 8f65a4440c
commit cbc6c299d4
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
doc/config/qtdeclarative_doc.pri
View File

@ -2,12 +2,24 @@ OTHER_FILES += \
$$PWD/qtquick.qdocconf \
$$PWD/qtquick-dita.qdocconf
online_docs.commands = qdoc3 $$PWD/qtquick.qdocconf
QDOC = $$QT.core.bins/qdoc
dita_docs.commands = qdoc3 $$PWD/qtquick-dita.qdocconf
ONLINE_CONF = $$PWD/qtquick.qdocconf
DITA_CONF = $$PWD/qtquick-dita.qdocconf
QCH_CONF = #nothing yet
$$unixstyle {
} else {
QDOC = $$replace(QDOC, "qdoc", "qdoc3.exe")
ONLINE_CONF = $$replace(ONLINE_CONF, "/", "\\")
DITA_DOCS = $$replace(ONLINE_CONF, "/", "\\")
}
online_docs.commands = $$QDOC $$ONLINE_CONF
dita_docs.commands = $$QDOC $$DITA_CONF
docs.depends = dita_docs online_docs
QMAKE_EXTRA_TARGETS = docs dita_docs online_docs
QMAKE_CLEAN += \
"-r $$PWD/html" \
"-r $$PWD/ditaxml"
"-r $$PWD/ditaxml"