fix install of QCH and HTML documentation

Forwarded: https://codereview.qt-project.org/c/qbs/qbs/+/404053
Last-Update: 2022-04-02

- qbs.qch should go to QT_INSTALL_DOCS, not to QBS_DOC_INSTALL_DIR
  (which ends with /html by default).
- HTML documentation was not installed at all.

Gbp-Pq: Name docs_install_path.diff

diff --git a/cmake/QbsDocumentation.cmake b/cmake/QbsDocumentation.cmake
index d9bdb7a092dadfd6908dcac8a998e69d5fa997b0..7e881e3ffc376daffc76daed9279bca5548f53a0 100644 (file)
--- a/cmake/QbsDocumentation.cmake
+++ b/cmake/QbsDocumentation.cmake
@@ -227,8 +227,10 @@ function(_qbs_setup_qhelpgenerator_targets _qdocconf_file _html_outputdir)
     add_custom_target("${_qch_target}" DEPENDS "${_qch_artifact}")
     add_dependencies(qbs_qch_docs "${_qch_target}")
 
-    install(FILES "${_qch_outputdir}/${_target}.qch" DESTINATION "${_arg_INSTALL_DIR}"
+    install(FILES "${_qch_outputdir}/${_target}.qch" DESTINATION "${QT_INSTALL_DOCS}"
         COMPONENT qbs_qch_docs)
+    install(DIRECTORY "${_qch_outputdir}/html/" DESTINATION "${_arg_INSTALL_DIR}"
+        COMPONENT qbs_html_docs)
 endfunction()
 
 # Helper functions: