Changeset 86707 in vbox

Timestamp:

Oct 26, 2020 1:36:51 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Several fixes in doc/Makefile etc.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• doc/manual/Makefile.kmk (modified) (5 diffs)
• doc/manual/htmlhelp-qthelp.py (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (modified) (2 diffs)

trunk/Config.kmk

@@ -6933 +6933 @@
 
  ifdef VBOX_WITH_DOCS_QHELP
-   ifeq ($(KBUILD_TARGET), linux)
-     #VBOX_QT_PLUGINS += \
-      # plugins/sqldrivers/libqsqlite.so
-     VBOX_QT_MOD += Qt5Help Qt5Network Qt5CLucene Qt5Sql
-   endif # linux
+  ifeq ($(KBUILD_TARGET), linux)
+   VBOX_QT_PLUGINS += \
+    plugins/sqldrivers/libqsqlite.so
+   VBOX_QT_MOD += Qt5Help Qt5Network Qt5CLucene Qt5Sql
+  endif # linux
  endif
 

trunk/doc/manual/Makefile.kmk

@@ -87 +87 @@
 endif
 
-
+VBOX_QHCP_FILES = \
+        UserManual.qhcp
+
+VBOX_QHELP_OUTPUT_FILES = \
+        UserManual.qch \
+        UserManual.qhc
 
 VBOXMANAGEHELP_PATH       ?= $(PATH_STAGE_BIN)/VBoxManageHelp$(SUFF_EXE)
@@ -155 +160 @@
   VBOX_PATH_BIN_QHELP = $(PATH_STAGE_BIN)/UserManual.qch
   VBOX_PATH_BIN_QHELP += $(PATH_STAGE_BIN)/UserManual.qhc
- else  # Do not build chm.
+ else  # Do not install qhelp.
   VBOX_PATH_BIN_QHELP =
  endif
@@ -208 +213 @@
         Accessibility.xml
 
- VBOX_QHCP_FILES = \
-        UserManual.qhcp
 
  # Wildcard the images path for every supported language
@@ -842 +845 @@
 html:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.html
 html:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-chunks/index.html
-qhelp:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/qhelp/UserManual.qhc
+qhelp:: $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/qhelp/, $(VBOX_QHELP_OUTPUT_FILES))
 html-zip:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.zip
 
@@ -955 +958 @@
         qcollectiongenerator $<
 
+$(VBOX_PATH_MANUAL_OUTBASE)/en_US/qhelp/UserManual.qch: \
+        $(VBOX_PATH_MANUAL_OUTBASE)/en_US/qhelp/UserManual.qhc
+
+
 # Handy aliases.
 validate-manpages:: $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/,$(VBOX_MANUAL_XML_REFENTRY_FILES))

trunk/doc/manual/htmlhelp-qthelp.py

@@ -221 +221 @@
     out_xml_lines = ['<?xml version="1.0" encoding="UTF-8"?>', \
                      '<QtHelpProject version="1.0">' , \
-                     '<namespace>org.qt-project.simpletextviewer</namespace>', \
+                     '<namespace>org.virtualbox</namespace>', \
                      '<virtualFolder>doc</virtualFolder>', \
                      '<filterSection>']

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -232 +232 @@
         $(if $(VBOX_GUI_WITH_CUSTOMIZATIONS1),VBOX_GUI_WITH_CUSTOMIZATIONS1) \
         $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE) \
+        $(if $(VBOX_WITH_DOCS_QHELP),VBOX_WITH_DOCS_QHELP) \
         $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,)
 ifdef VBOX_WITH_DEBUGGER_GUI

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -3200 +3200 @@
 void UIMessageCenter::sltShowUserManual(const QString &strLocation)
 {
+    Q_UNUSED(strLocation);
 #if defined (VBOX_WS_WIN)
     HtmlHelp(GetDesktopWindow(), strLocation.utf16(), HH_DISPLAY_TOPIC, NULL);
 #elif defined (VBOX_WS_X11)
-# if !defined(VBOX_OSE) && defined(VBOX_WITH_KCHMVIEWER)
+ #if defined(VBOX_WITH_DOCS_QHELP)
+
     char szViewerPath[RTPATH_MAX];
     int rc;
@@ -3209 +3211 @@
     AssertRC(rc);
     QProcess::startDetached(QString(szViewerPath) + "/kchmviewer", QStringList(strLocation));
-# else /* #if !defined(VBOX_OSE) && defined(VBOX_WITH_KCHMVIEWER) */
+
     /* instead of viewing the pdf manual show qtHelp one. This is soon to be default in all platforms. */
     showHelpBrowser(strLocation);
-# endif /* #if defined(VBOX_OSE) || !defined(VBOX_WITH_KCHMVIEWER) */
+# endif /* #if defined(VBOX_WITH_DOCS_QHELP) */
 #elif defined (VBOX_WS_MAC)
     uiCommon().openURL("file://" + strLocation);