diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2009-10-26 15:35:37 +0100 |
|---|---|---|
| committer | Daniel Molkentin <daniel.molkentin@nokia.com> | 2009-10-26 15:36:09 +0100 |
| commit | c6e9c041a76587c68aa6d866288e2e6093db5139 (patch) | |
| tree | 281d00f2465178fc20a272feb8815b1f161a81b6 /doc/doc.pri | |
| parent | cd3435a9835dda6c0d5cc2295c5642c47045caca (diff) | |
Do not require QTDIR to be set.
Reviewed-By: Oswald Buddenhagen
Diffstat (limited to 'doc/doc.pri')
| -rw-r--r-- | doc/doc.pri | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index b15059163f..5c93f3d3a5 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -1,15 +1,14 @@ -unix:QDOC_BIN = $$(QTDIR)/bin/qdoc3 -win32:QDOC_BIN = $$(QTDIR)/bin/qdoc3.exe +QDOC_BIN = $$[QT_INSTALL_BINS]/qdoc3 win32:QDOC_BIN = $$replace(QDOC_BIN, "/", "\\") unix { QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$QDOC_BIN - HELPGENERATOR = $$(QTDIR)/bin/qhelpgenerator + HELPGENERATOR = $$[QT_INSTALL_BINS]/qhelpgenerator } else { QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$QDOC_BIN # Always run qhelpgenerator inside its own cmd; this is a workaround for # an unusual bug which causes qhelpgenerator.exe to do nothing - HELPGENERATOR = cmd /C $$(QTDIR)\bin\qhelpgenerator.exe + HELPGENERATOR = cmd /C $$replace($$list($$[QT_INSTALL_BINS]/qhelpgenerator.exe), "/", "\\") } QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp |