Skip to content
Snippets Groups Projects
Commit c6e9c041 authored by Daniel Molkentin's avatar Daniel Molkentin
Browse files

Do not require QTDIR to be set.

Reviewed-By: Oswald Buddenhagen
parent cd3435a9
No related branches found
No related tags found
No related merge requests found
unix:QDOC_BIN = $$(QTDIR)/bin/qdoc3 QDOC_BIN = $$[QT_INSTALL_BINS]/qdoc3
win32:QDOC_BIN = $$(QTDIR)/bin/qdoc3.exe
win32:QDOC_BIN = $$replace(QDOC_BIN, "/", "\\") win32:QDOC_BIN = $$replace(QDOC_BIN, "/", "\\")
unix { unix {
QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$QDOC_BIN QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$QDOC_BIN
HELPGENERATOR = $$(QTDIR)/bin/qhelpgenerator HELPGENERATOR = $$[QT_INSTALL_BINS]/qhelpgenerator
} else { } else {
QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$QDOC_BIN QDOC = set SRCDIR=$$PWD&& set OUTDIR=$$OUT_PWD/doc/html&& $$QDOC_BIN
# Always run qhelpgenerator inside its own cmd; this is a workaround for # Always run qhelpgenerator inside its own cmd; this is a workaround for
# an unusual bug which causes qhelpgenerator.exe to do nothing # 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 QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment