diff --git a/utils_ide/qtcreator/externaltools/qtc_doxy_file.py b/utils_ide/qtcreator/externaltools/qtc_doxy_file.py index 5034cf93c8204824b3f2475363b1e64afa70c215..bca773c4aad48108921eb0b3aff30c0e9e7485d2 100755 --- a/utils_ide/qtcreator/externaltools/qtc_doxy_file.py +++ b/utils_ide/qtcreator/externaltools/qtc_doxy_file.py @@ -2,6 +2,9 @@ """ This script takes 2-3 args: [--browse] <Doxyfile> <sourcefile> +Where Doxyfile is a path relative to source root, +and the sourcefile as an absolute path. + --browse will open the resulting docs in a web browser. """ import sys @@ -17,15 +20,9 @@ def find_gitroot(filepath_reference): path = os.path.dirname(path) return path -def find_doxy(filepath_reference): - root = find_gitroot(filepath_reference) - - # project specific! - return os.path.join(root, "doc", "doxygen", "Doxyfile") - -sourcefile = sys.argv[-1] +doxyfile, sourcefile = sys.argv[-2:] -doxyfile = find_doxy(sourcefile) +doxyfile = os.path.join(find_gitroot(sourcefile), doxyfile) os.chdir(os.path.dirname(doxyfile)) tempfile = tempfile.NamedTemporaryFile(mode='w+b') diff --git a/utils_ide/qtcreator/externaltools/qtc_doxy_file.xml b/utils_ide/qtcreator/externaltools/qtc_doxy_file.xml index 2a2ac13e3c1e3cbae26776ab56c0d0444681935d..af1dc264f636b6d50706beffc9f8cef6d51605fb 100644 --- a/utils_ide/qtcreator/externaltools/qtc_doxy_file.xml +++ b/utils_ide/qtcreator/externaltools/qtc_doxy_file.xml @@ -5,7 +5,7 @@ <category>Documentation</category> <executable output="showinpane" error="showinpane" modifiesdocument="no"> <path>qtc_doxy_file.py</path> - <arguments>--browse %{CurrentDocument:FilePath}</arguments> + <arguments>--browse doc/doxygen/Doxyfile %{CurrentDocument:FilePath}</arguments> <workingdirectory>%{CurrentProject:BuildPath}</workingdirectory> </executable> </externaltool>