Changeset 101553 in vbox for trunk/doc/manual

Timestamp:

Oct 23, 2023 2:09:23 PM (15 months ago)

Author:

vboxsync

Message:

doc/manual: bugref:10450: Get rid of Qt5 stuff.

File:

• trunk/doc/manual/Makefile.kmk (modified) (2 diffs)

trunk/doc/manual/Makefile.kmk

@@ -951 +951 @@
 
   # Enable Qt and locate the Qt help generator.
-  ifdef VBOX_WITH_QT6
-   USES += qt6
-   VBOX_QHELPGENERATOR = $(PATH_TOOL_QT6_LIBEXEC)/qhelpgenerator
-  else
-   USES += qt5
-   VBOX_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')
-   VBOX_QHELPGENERATOR = $(PATH_TOOL_QT5_BIN)/$(if-expr $(VBOX_QHELPGENERATOR_VERSION_MINOR) >= 12,qhelpgenerator,qcollectiongenerator)
-  endif
+  USES += qt6
+  VBOX_QHELPGENERATOR = $(PATH_TOOL_QT6_LIBEXEC)/qhelpgenerator
 
   ## Build QHelp version of manual for given language.
@@ -1024 +1018 @@
         $$(call MSG_L1,$$(notdir $$(VBOX_QHELPGENERATOR)) $$<,=> $$@)
         $$(QUIET)$$(RM) -f -- "$$@"
-   ifdef VBOX_WITH_QT6
         $$(QUIET)$$(REDIRECT) -E "QT_PLUGIN_PATH=$$(PATH_SDK_QT6)/plugins" -E "QT_QPA_PLATFORM_PLUGIN_PATH=$$(PATH_SDK_QT6)/plugins/platforms" -- $$(VBOX_QHELPGENERATOR) $$<
-   else
-        $$(QUIET)$$(REDIRECT) -E QT_QPA_PLATFORM_PLUGIN_PATH=$$(PATH_SDK_QT5)/plugins -- $$(VBOX_QHELPGENERATOR) $$<
-   endif
         $$(call MSG_L1,Fresh QCH is now at $$@)