diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2012-06-19 16:41:35 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-20 02:24:47 +0200 |
| commit | cbc6c299d48b05500c8f496abed5ef8b8f735add (patch) | |
| tree | 34414a2318186c3ab0a9278c0da847b2c33b945e /doc | |
| parent | 8f65a4440c0078f82f311b56200aec081a6fdd85 (diff) | |
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>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/config/qtdeclarative_doc.pri | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/doc/config/qtdeclarative_doc.pri b/doc/config/qtdeclarative_doc.pri index 51f2fceb7a..c2cf908ff4 100644 --- a/doc/config/qtdeclarative_doc.pri +++ b/doc/config/qtdeclarative_doc.pri @@ -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"
\ No newline at end of file + "-r $$PWD/ditaxml" |