Changeset 28593 in vbox

Timestamp:

Apr 22, 2010 1:20:10 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

60437

Message:

FE/Qt: use the pdf manual only on X11 hosts

Location:

trunk

Files:

• Config.kmk (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/globals/VBoxProblemReporter.cpp (modified) (1 diff)

trunk/Config.kmk

@@ -271 +271 @@
 VBOX_WITH_DOCS_PACKING = 1
 # Include CHM when building docs (unset in LocalConfig.kmk to suppress CHM)
-VBOX_WITH_DOCS_CHM = 1
+ifneq ($(KBUILD_TARGET),linux)
+ VBOX_WITH_DOCS_CHM = 1
+endif
 # Don't bother with documentation, overrides VBOX_WITH_DOCS.
 # This is not used by makefiles, only Config.kmk, see below.
@@ -458 +460 @@
 VBOX_WITH_MULTIVERSION_PYTHON ?= 1
 # Enable the kchmviewer.
-VBOX_WITH_KCHMVIEWER = 1
+VBOX_WITH_KCHMVIEWER =
 # Build the testsuite.
 VBOX_WITH_TESTSUITE = 1

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

@@ -3406 +3406 @@
     const QString suffix = "pdf";
 #elif defined (Q_WS_X11)
-# if defined VBOX_OSE
     const QString name = "UserManual";
     const QString suffix = "pdf";
-# else
-    const QString name = "VirtualBox";
-    const QString suffix = "chm";
-# endif
 #endif
     /* Where are the docs located? */

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

@@ -2609 +2609 @@
 #if defined (Q_WS_WIN32)
     HtmlHelp(GetDesktopWindow(), strLocation.utf16(), HH_DISPLAY_TOPIC, NULL);
-#elif defined (Q_WS_X11)
-# ifndef VBOX_OSE
-    char szViewerPath[RTPATH_MAX];
-    int rc;
-    rc = RTPathAppPrivateArch(szViewerPath, sizeof(szViewerPath));
-    AssertRC(rc);
-    QProcess::startDetached(QString(szViewerPath) + "/kchmviewer", QStringList(strLocation));
-# else /* #ifndef VBOX_OSE */
-    vboxGlobal().openURL("file://" + strLocation);
-# endif /* #ifdef VBOX_OSE */
-#elif defined (Q_WS_MAC)
+#elif defined (Q_WS_X11) || defined (Q_WS_MAC)
     vboxGlobal().openURL("file://" + strLocation);
 #endif