IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5937 from tk0miya/fix_pathsep_in_qhpfile

Browse Source 
Fix QtHelp: OS dependent path separator is used in .qhp file
This commit is contained in:
Takeshi KOMIYA 2019-01-13 11:13:04 +09:00 committed by GitHub
commit 5d8d8a064e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -175,6 +175,7 @@ Bugs fixed
* LaTeX: authors are not shown if :confval:`latex_documents` omitted
* HTML: Invalid HTML5 file is generated for a glossary having multiple terms for
one description (refs: #4611)
* QtHelp: OS dependent path separator is used in .qhp file
Testing
--------

4
sphinx/builders/qthelp.py
View File

@ -24,7 +24,7 @@ from sphinx.environment.adapters.indexentries import IndexEntries
from sphinx.locale import __
from sphinx.util import logging
from sphinx.util.nodes import NodeMatcher
from sphinx.util.osutil import make_filename
from sphinx.util.osutil import canon_path, make_filename
from sphinx.util.template import SphinxRenderer
if False:
@ -260,7 +260,7 @@ class QtHelpBuilder(StandaloneHTMLBuilder):
for fn in sorted(files):
if (resourcedir and not fn.endswith('.js')) or fn.endswith('.html'):
filename = path.join(root, fn)[olen:]
project_files.append(filename)
project_files.append(canon_path(filename))
return project_files