1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Assume qhelpgenerator in libexec instead of bin

Browse Source 
Task-number: QTBUG-88791
Change-Id: I0f6dc14401e715a98322abc21da3f88e34118e27
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
This commit is contained in:
Joerg Bornemann 2021-11-08 16:11:56 +01:00
parent ecfbc918d7
commit 4f360e3b76
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -91,7 +91,7 @@ __pycache__
/bin/qglinfo /bin/qglinfo
/bin/qgltf /bin/qgltf
/bin/qhelpconverter /bin/qhelpconverter
/bin/qhelpgenerator /libexec/qhelpgenerator
/bin/qlalr /bin/qlalr
/bin/qml /bin/qml
/bin/qmleasing /bin/qmleasing

2
cmake/QtDocsHelpers.cmake
View File

@ -46,7 +46,7 @@ function(qt_internal_add_docs)
set(qdoc_bin "${doc_tools_bin}/qdoc${CMAKE_EXECUTABLE_SUFFIX}") set(qdoc_bin "${doc_tools_bin}/qdoc${CMAKE_EXECUTABLE_SUFFIX}")
set(qtattributionsscanner_bin "${doc_tools_libexec}/qtattributionsscanner${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) get_target_property(target_type ${target} TYPE)
if (NOT target_type STREQUAL "INTERFACE_LIBRARY") if (NOT target_type STREQUAL "INTERFACE_LIBRARY")

2
mkspecs/features/qt_docs.prf
View File

@ -47,7 +47,7 @@ isEmpty(WIN_INCLUDETEMP) {
macos: QDOC_INCLUDE_PATHS += $$join(QMAKE_DEFAULT_INCDIRS," -I","-I") 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) qtPrepareLibExecTool(QTATTRIBUTIONSSCANNER, qtattributionsscanner)