Changeset 94821 in vbox for trunk/doc/manual

Timestamp:

May 4, 2022 1:46:49 PM (3 years ago)

Author:

vboxsync

Message:

Docs/Ds: bugref:9898: Adjust qhelpgenerator for Qt6, no more old qcollectiongenerator there.

File:

• trunk/doc/manual/Makefile.kmk (modified) (1 diff)

trunk/doc/manual/Makefile.kmk

@@ -148 +148 @@
 
  ifdef VBOX_WITH_DOCS_QHELP
-  USES += qt5
-  INSTALLS += VBox-docs-usermanual-qhc
-  INSTALLS += VBox-docs-usermanual-qch
-  QHELPGENERATOR_VERSION_MINOR = $(shell $(REDIRECT) -E QT_QPA_PLATFORM_PLUGIN_PATH=$(PATH_SDK_QT5)/plugins -- $(PATH_TOOL_QT5_BIN)/qhelpgenerator -v 2>/dev/null | $(SED) -ne 's/.*(Qt [1-9][0-9]*\.\([1-9][0-9]*\)\.[1-9][0-9]*).*$$/\1/p')
-  QHELPGENERATOR = $(PATH_TOOL_QT5_BIN)/$(if-expr $(QHELPGENERATOR_VERSION_MINOR) >= 12,qhelpgenerator,qcollectiongenerator)
+  ifdef VBOX_WITH_QT6
+   USES += qt6
+   INSTALLS += VBox-docs-usermanual-qhc
+   INSTALLS += VBox-docs-usermanual-qch
+   QHELPGENERATOR = $(PATH_TOOL_QT6_LIBEXEC)/qhelpgenerator
+  else # Qt5
+   USES += qt5
+   INSTALLS += VBox-docs-usermanual-qhc
+   INSTALLS += VBox-docs-usermanual-qch
+   QHELPGENERATOR_VERSION_MINOR = $(shell $(REDIRECT) -E QT_QPA_PLATFORM_PLUGIN_PATH=$(PATH_SDK_QT5)/plugins -- $(PATH_TOOL_QT5_BIN)/qhelpgenerator -v 2>/dev/null | $(SED) -ne 's/.*(Qt [1-9][0-9]*\.\([1-9][0-9]*\)\.[1-9][0-9]*).*$$/\1/p')
+   QHELPGENERATOR = $(PATH_TOOL_QT5_BIN)/$(if-expr $(QHELPGENERATOR_VERSION_MINOR) >= 12,qhelpgenerator,qcollectiongenerator)
+  endif
  endif
  ifdef VBOX_WITH_DOCS_QHELP_PACKING