diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2009-08-21 12:52:54 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2009-08-24 14:15:12 +0200 |
| commit | 8787d9736924bcc2aaad6409ae41304802b7c70d (patch) | |
| tree | 6c3eeca223a25978d59683b9e52a3d33aef169f7 | |
| parent | 3118f0aa62a9ea35f8276d6cb0e895d7c76ee7ab (diff) | |
Find qmake in the right location for Qt 4.6+
(cherry picked from commit a4ff2aa72542b1a681abe8577c29e4bbfcc0d59c)
| -rw-r--r-- | doc/doc.pri | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index 98c6652a4b..a8046d62e8 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 } |