diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-02 21:35:31 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-24 20:43:58 +0100 |
| commit | 67c186abeaa3a60640a0db42f51051322072e640 (patch) | |
| tree | 0f80982c369e2968a7509297b996aa812856fc99 /doc/doc.pri | |
| parent | 4ed8902f51f15ab1a937af5d54028ad6b2e97810 (diff) | |
less bizarre build command setup for windows
Diffstat (limited to 'doc/doc.pri')
| -rw-r--r-- | doc/doc.pri | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index c39bc84b1c..19a040afc4 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -1,24 +1,21 @@ -QDOC_BIN = $$[QT_INSTALL_BINS]/qdoc3 -win32:QDOC_BIN = $$replace(QDOC_BIN, "/", "\\") +QDOC_BIN = $$targetPath($$[QT_INSTALL_BINS]/qdoc3) +HELPGENERATOR = $$targetPath($$[QT_INSTALL_BINS]/qhelpgenerator) -unix { - QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$QDOC_BIN - HELPGENERATOR = $$[QT_INSTALL_BINS]/qhelpgenerator -} else { +equals(QMAKE_DIR_SEP, /) { # unix, mingw+msys + QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$QDOC_BIN +} else:win32-g++* { # just mingw + # The lack of spaces in front of the && is necessary! 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 $$replace($$list($$[QT_INSTALL_BINS]/qhelpgenerator.exe), "/", "\\") +} else { # nmake + QDOC = set SRCDIR=$$PWD $$escape_expand(\n\t) \ + set OUTDIR=$$OUT_PWD/doc/html $$escape_expand(\n\t) \ + $$QDOC_BIN } QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp QCH_FILE = $$IDE_DOC_PATH/qtcreator.qch -unix { html_docs.commands = $$QDOC $$PWD/qtcreator.qdocconf -} else { -html_docs.commands = \"$$QDOC $$PWD/qtcreator.qdocconf\" -} html_docs.depends += $$PWD/qtcreator.qdoc $$PWD/qtcreator.qdocconf html_docs.files = $$QHP_FILE |