From bacccd11a7ae12ffb683e4ede4bde3768cc7d1e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= <jedrzej.nowacki@digia.com>
Date: Mon, 11 Feb 2013 17:19:31 +0100
Subject: [PATCH] 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>
---
git-hooks/qdoc-bot | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
--
GitLab