1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
From: Felix Krull <f_krull@gmx.de>
Date: Sat, 18 Apr 2020 21:55:40 +0200
Subject: Fix docs build with Sphinx >= 2.0
Origin: upstream, https://bitbucket.org/heldercorreia/speedcrunch/commits/f57ed5c4cce5772cc402813b913b9c450de3c99f
---
README.md | 3 ++-
doc/src/extensions/qtkeyword.py | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index 49bc081..98b79b3 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,7 @@ running CMake, in the form `cmake ../src -Dvariable=value`.
requires the following additional software:
- [Python](http://python.org) 3.4 or later
- [Sphinx](http://sphinx-doc.org) 1.3 or later
+ - [the Qt help builder extension](https://github.com/sphinx-doc/sphinxcontrib-qthelp) 1.0 or later
- [the Quark theme](https://pypi.python.org/pypi/quark-sphinx-theme) 0.2 or later
## Contributing
@@ -56,4 +57,4 @@ the Free Software Foundation; either version 2 of the License, or
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
\ No newline at end of file
+GNU General Public License for more details.
diff --git a/doc/src/extensions/qtkeyword.py b/doc/src/extensions/qtkeyword.py
index d5995f3..2b3cc59 100644
--- a/doc/src/extensions/qtkeyword.py
+++ b/doc/src/extensions/qtkeyword.py
@@ -19,7 +19,7 @@
# Boston, MA 02110-1301, USA.
from docutils.parsers.rst import Directive
-from sphinx.builders.qthelp import QtHelpBuilder
+from sphinxcontrib.qthelp import QtHelpBuilder
from docutils import nodes
@@ -139,6 +139,7 @@ def process_keywords(app, env, docname):
def setup(app):
+ app.setup_extension('sphinxcontrib.qthelp')
app.add_config_value('ignore_qtkeywords', True, 'html')
app.add_builder(MyQtHelpBuilder)
app.add_directive('qtkeyword', QtKeywordDirective)
|
