From a4ff2aa72542b1a681abe8577c29e4bbfcc0d59c Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Fri, 21 Aug 2009 12:52:54 +0200
Subject: [PATCH] Find qmake in the right location for Qt 4.6+
---
doc/doc.pri | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/doc/doc.pri b/doc/doc.pri
index 98c6652a4b9..a8046d62e84 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -1,8 +1,16 @@
+QDOC_BIN = $$(QTDIR)/bin/qdoc3
+win32:QDOC_BIN = $$replace(QDOC_BIN, "/", "\\")
+
+!exists( $$QDOC_BIN ) {
+ QDOC_BIN = $$(QTDIR)/tools/qdoc3/qdoc3
+ win32:QDOC_BIN = $$replace(QDOC_BIN, "/", "\\")
+}
+
unix {
- QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$(QTDIR)/tools/qdoc3/qdoc3
+ QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$QDOC_BIN
HELPGENERATOR = $$(QTDIR)/bin/qhelpgenerator
} else {
- QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$(QTDIR)\tools\qdoc3\release\qdoc3.exe
+ QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$QDOC_BIN
HELPGENERATOR = $$(QTDIR)\bin\qhelpgenerator.exe
}
--
GitLab