Changeset 86707 in vbox for trunk/src/VBox/Frontends

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/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/globals/UIMessageCenter.cpp (modified) (2 diffs)

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);