From 32bdbfd1d4215136393f774aeebfc3f09e19e171 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Mon, 8 Nov 2021 16:11:56 +0100
Subject: [PATCH] Assume qhelpgenerator in libexec instead of bin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Task-number: QTBUG-88791
Fixes: QTBUG-101776
Change-Id: I0f6dc14401e715a98322abc21da3f88e34118e27
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit 4f360e3b765a2fc2aff4958adcf5d4ef9f3befe0)
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 .gitignore                   | 2 +-
 cmake/QtDocsHelpers.cmake    | 2 +-
 mkspecs/features/qt_docs.prf | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9ef8f80df13..f516e529b5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,7 +90,7 @@ qt*-config.pri
 /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
index a06d36f0ef8..ae8034318e0 100644
--- 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
index b1a1e1ad928..2a079c90a91 100644
--- a/mkspecs/features/qt_docs.prf
+++ b/mkspecs/features/qt_docs.prf
@@ -47,7 +47,7 @@ isEmpty(QDOC_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)