From 4f360e3b765a2fc2aff4958adcf5d4ef9f3befe0 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 8 Nov 2021 16:11:56 +0100 Subject: 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 Change-Id: I0f6dc14401e715a98322abc21da3f88e34118e27 Reviewed-by: Topi Reiniö --- .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 6126a58ddf..a8b18d0f19 100644 --- 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 index a06d36f0ef..ae8034318e 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 3414941579..1df06014b7 100644 --- 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) -- cgit v1.2.3