From 670a1a6b6a509fffdd26315fa0d6334f89c9bdd1 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Fri, 21 Aug 2009 13:50:06 +0200 Subject: help: try to fix windows case for qdoc detection (cherry picked from commit f888f5df2d8bb510ca97a3d54ce45ff367594c56) --- doc/doc.pri | 15 ++++++++++++--- 1 file 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 { -- cgit v1.2.3