diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2009-08-21 13:50:06 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-08-24 14:15:21 +0200 |
| commit | 670a1a6b6a509fffdd26315fa0d6334f89c9bdd1 (patch) | |
| tree | 668099b47cbee2a434ffd11575b5366aec38a9ff | |
| parent | 8787d9736924bcc2aaad6409ae41304802b7c70d (diff) | |
help: try to fix windows case for qdoc detection
(cherry picked from commit f888f5df2d8bb510ca97a3d54ce45ff367594c56)
| -rw-r--r-- | doc/doc.pri | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index a8046d62e8..0deac0fc4a 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -1,9 +1,18 @@ -QDOC_BIN = $$(QTDIR)/bin/qdoc3 +unix:QDOC_BIN = $$(QTDIR)/bin/qdoc3 +win32:QDOC_BIN = $$(QTDIR)/bin/qdoc3.exe win32:QDOC_BIN = $$replace(QDOC_BIN, "/", "\\") +# legacy branch, can be dropped as soon as we depend on Qt 4.6 !exists( $$QDOC_BIN ) { - QDOC_BIN = $$(QTDIR)/tools/qdoc3/qdoc3 - win32:QDOC_BIN = $$replace(QDOC_BIN, "/", "\\") + unix:QDOC_BIN = $$(QTDIR)/tools/qdoc3/qdoc3 + win32 { + QDOC_BIN = $$(QTDIR)/tools/qdoc3/release/qdoc3.exe + QDOC_BIN = $$replace(QDOC_BIN, "/", "\\") + !exists( $$QDOC_BIN ) { + QDOC_BIN = $$(QTDIR)/tools/qdoc3/debug/qdoc3.exe + QDOC_BIN = $$replace(QDOC_BIN, "/", "\\") + } + } } unix { |