diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@digia.com> | 2013-02-11 17:19:31 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-12 11:41:25 +0100 |
| commit | bacccd11a7ae12ffb683e4ede4bde3768cc7d1e4 (patch) | |
| tree | f2d523f00d75aa0457fb2a8e2d135aba6c67a014 /git-hooks/qdoc-bot | |
| parent | e2f973a8d057c310ef6a437ad26aee4d93e33a69 (diff) | |
Remove dependency on qhelpgenerator.
At some point "make docs" command started to need qhelpgenerator which
doesn't exist in qtbase, so it can not be used. That was causing
the qdoc bot to fail with a cryptic message:
make[3]: *** Waiting for unfinished jobs....
Change-Id: I2bf2dd421fc55720a68a4659ddffbd3b789facf1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'git-hooks/qdoc-bot')
| -rwxr-xr-x | git-hooks/qdoc-bot | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-hooks/qdoc-bot b/git-hooks/qdoc-bot index dfa8610..a540c0b 100755 --- a/git-hooks/qdoc-bot +++ b/git-hooks/qdoc-bot @@ -72,7 +72,7 @@ def run_qdoc(module_name): environment["QT_HASH_SEED"] = "1234" cmd = "(./configure -opensource -confirm-license -release && make sub-src-qmake_all && cd src/tools && make sub-qdoc) > /dev/null" subprocess.check_call(cmd, shell=True, env=environment) - cmd = "make docs".split() + cmd = "make html_docs".split() output.append(subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=environment).communicate()[1]) def smart_concatenate(r, x): # concatenate multi-line comments |