Skip to content

Commit f3ba64c

Browse files
committed
[docs] Call qhelpgenerator from Qt6.
1 parent 530c6fb commit f3ba64c

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

.github/workflows/root-docs-ci.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,13 @@ jobs:
7272
- name: Prepare qhelpgenerator
7373
# Qt6's libexec executables are not in the PATH by default
7474
run: |
75-
which qhelpgenerator && exit 0 # Already in PATH
76-
PATH=/usr/lib64/qt6/libexec/:${PATH} which qhelpgenerator && echo "/usr/lib64/qt6/libexec/" >> "${GITHUB_PATH}"
75+
QHELPGENERATOR=$(which qhelpgenerator)
76+
if [ -f "${QHELPGENERATOR}" ]; then
77+
echo "QHELPGENERATOR=${QHELPGENERATOR}" >> "${GITHUB_ENV}";
78+
else
79+
PATH=/usr/lib64/qt6/libexec/:${PATH} QHELPGENERATOR=$(which qhelpgenerator)
80+
echo "QHELPGENERATOR=${QHELPGENERATOR}" >> "${GITHUB_ENV}"
81+
fi
7782
7883
- name: Checkout
7984
uses: actions/checkout@v6

documentation/doxygen/Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1700,7 +1700,7 @@ QHP_SECT_FILTER_ATTRS =
17001700
# run qhelpgenerator on the generated .qhp file.
17011701
# This tag requires that the tag GENERATE_QHP is set to YES.
17021702

1703-
QHG_LOCATION = qhelpgenerator
1703+
QHG_LOCATION = $(QHELPGENERATOR)
17041704

17051705
# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
17061706
# generated, together with the HTML files, they form an Eclipse help plugin. To

0 commit comments

Comments
 (0)