From d5f763387d85857d37564b2a2eff49fd2d89fb63 Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Wed, 30 Sep 2009 00:45:37 +1000
Subject: [PATCH] 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
---
doc/doc.pri | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/doc/doc.pri b/doc/doc.pri
index 20daddba3bd..cfe94c29ea4 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
--
GitLab