Assume qhelpgenerator in libexec instead of bin

Task-number: QTBUG-88791 Change-Id: I0f6dc14401e715a98322abc21da3f88e34118e27 Reviewed-by: Topi Reiniö <[email protected]>
justforlxz · Nov 8, 2021 · 4f360e3 · 4f360e3
1 parent ecfbc91
commit 4f360e3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -91,7 +91,7 @@ __pycache__
 /bin/qglinfo
 /bin/qgltf
 /bin/qhelpconverter
-/bin/qhelpgenerator
+/libexec/qhelpgenerator
 /bin/qlalr
 /bin/qml
 /bin/qmleasing

diff --git a/cmake/QtDocsHelpers.cmake b/cmake/QtDocsHelpers.cmake
@@ -46,7 +46,7 @@ function(qt_internal_add_docs)
 
     set(qdoc_bin "${doc_tools_bin}/qdoc${CMAKE_EXECUTABLE_SUFFIX}")
     set(qtattributionsscanner_bin "${doc_tools_libexec}/qtattributionsscanner${CMAKE_EXECUTABLE_SUFFIX}")
-    set(qhelpgenerator_bin "${doc_tools_bin}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}")
+    set(qhelpgenerator_bin "${doc_tools_libexec}/qhelpgenerator${CMAKE_EXECUTABLE_SUFFIX}")
 
     get_target_property(target_type ${target} TYPE)
     if (NOT target_type STREQUAL "INTERFACE_LIBRARY")

diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
@@ -47,7 +47,7 @@ isEmpty(WIN_INCLUDETEMP) {
 
 macos: QDOC_INCLUDE_PATHS += $$join(QMAKE_DEFAULT_INCDIRS," -I","-I")
 
-!build_online_docs: qtPrepareTool(QHELPGENERATOR, qhelpgenerator)
+!build_online_docs: qtPrepareLibExecTool(QHELPGENERATOR, qhelpgenerator)
 
 qtPrepareLibExecTool(QTATTRIBUTIONSSCANNER, qtattributionsscanner)