diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-09-30 00:45:37 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-09-30 01:02:40 +1000 |
| commit | d5f763387d85857d37564b2a2eff49fd2d89fb63 (patch) | |
| tree | b74d9a300579f5462b999987109c31a90bb3e119 /doc | |
| parent | ca9fe00c6af6725a9167d344fbd0959bc4f5fa38 (diff) | |
Workaround bug where documentation sometimes is not generated.
On Windows, for unknown reasons, qhelpgenerator.exe sometimes will
not generate the documentation if run directly from nmake.
Running it through an intermediate cmd seems to work.
So, do that.
Reviewed-by: Daniel Molkentin
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc.pri | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index 20daddba3b..cfe94c29ea 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -19,8 +19,10 @@ unix { 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&& $$QDOC_BIN - HELPGENERATOR = $$(QTDIR)\bin\qhelpgenerator.exe + 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 } QHP_FILE = $$OUT_PWD/doc/html/qtcreator.qhp |