From: Chris Adams <christopher.adams@nokia.com>
Date: Tue, 19 Jun 2012 06:41:35 +0000 (+1000)
Subject: Remove hardcoded qdoc3 command from qtdeclarative_doc.pri
X-Git-Tag: 071012131707~157
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cbc6c299d48b05500c8f496abed5ef8b8f735add;p=profile%2Fivi%2Fqtdeclarative.git

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>
---

diff --git a/doc/config/qtdeclarative_doc.pri b/doc/config/qtdeclarative_doc.pri
index 51f2fce..c2cf908 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"