VirtualBox

Changeset 99860 in vbox


Ignore:
Timestamp:
May 19, 2023 2:47:15 PM (21 months ago)
Author:
vboxsync
Message:

FE/Qt: bugref:10451. Reverting r157497.

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r99859 r99860  
    794794if1of ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH), darwin.arm64)
    795795 VBOX_WITH_QT6 := 1
     796endif
     797# Enable the QHelp based help function in UI.
     798if1of ($(KBUILD_TARGET), darwin linux solaris win)
     799 VBOX_WITH_QHELP_VIEWER = 1
    796800endif
    797801# VBox Ballooning Control frontend.
    … …  
    77537757 endif # linux freebsd netbsd openbsd solaris win
    77547758
    7755  ifdef VBOX_WITH_DOCS_QHELP
     7759 ifdef VBOX_WITH_QHELP_VIEWER
    77567760  ifeq ($(KBUILD_TARGET),darwin)
    77577761   VBOX_QT_MOD  += QtHelp QtNetwork QtSql

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

    r99859 r99860  
    263263        $(if $(VBOX_GUI_WITH_CUSTOMIZATIONS1),VBOX_GUI_WITH_CUSTOMIZATIONS1) \
    264264        $(if $(VBOX_WITH_RAW_MODE),VBOX_WITH_RAW_MODE) \
    265         $(if $(VBOX_WITH_DOCS_QHELP),VBOX_WITH_DOCS_QHELP) \
     265        $(if $(VBOX_WITH_QHELP_VIEWER),VBOX_WITH_QHELP_VIEWER) \
    266266        $(if $(VBOX_WITH_SCREENSAVER_CONTROL),VBOX_WITH_SCREENSAVER_CONTROL) \
    267267        $(if $(VBOX_WITH_SDS),VBOX_WITH_SDS,) \
    … …  
    10311031        src/wizards/newvd/UIWizardNewVDExpertPage.h
    10321032
    1033 ifdef VBOX_WITH_DOCS_QHELP
     1033ifdef VBOX_WITH_QHELP_VIEWER
    10341034 UICommon_QT_MOCHDRS += \
    10351035        src/helpbrowser/UIHelpViewer.h \
    … …  
    11441144        src/widgets/UIToolBox.cpp
    11451145
    1146 ifdef VBOX_WITH_DOCS_QHELP
     1146ifdef VBOX_WITH_QHELP_VIEWER
    11471147 UICommon_QT_MOCSRCS += \
    11481148        src/helpbrowser/UIHelpViewer.cpp \
    … …  
    16241624        src/wizards/newvd/UIWizardNewVDExpertPage.cpp
    16251625
    1626 ifdef VBOX_WITH_DOCS_QHELP
     1626ifdef VBOX_WITH_QHELP_VIEWER
    16271627 UICommon_SOURCES += \
    16281628        src/helpbrowser/UIHelpViewer.cpp \
    … …  
    17701770endif
    17711771
    1772 ifdef VBOX_WITH_DOCS_QHELP
     1772ifdef VBOX_WITH_QHELP_VIEWER
    17731773 UICommon_QT_MODULES   += Help
    17741774endif

  • trunk/src/VBox/Frontends/VirtualBox/src/globals/UICommon.cpp

    r99859 r99860  
    23772377QString UICommon::helpFile()
    23782378{
    2379 #if defined (VBOX_WITH_DOCS_QHELP)
     2379#if defined (VBOX_WITH_QHELP_VIEWER)
    23802380    const QString strName = "UserManual";
    23812381    const QString strSuffix = "qhc";

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

    r99859 r99860  
    21442144{
    21452145    Q_UNUSED(strLocation);
    2146 #if defined (VBOX_WITH_DOCS_QHELP)
     2146#if defined (VBOX_WITH_QHELP_VIEWER)
    21472147    showHelpBrowser(strLocation);
    21482148#else
    … …  
    21732173void UIMessageCenter::sltHandleHelpRequest()
    21742174{
    2175 #if defined(VBOX_WITH_DOCS_QHELP)
     2175#if defined(VBOX_WITH_QHELP_VIEWER)
    21762176    sltHandleHelpRequestWithKeyword(uiCommon().helpKeyword(sender()));
    21772177#endif /* #if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))&& (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)) */
    … …  
    21802180void UIMessageCenter::sltHandleHelpRequestWithKeyword(const QString &strHelpKeyword)
    21812181{
    2182 #if defined(VBOX_WITH_DOCS_QHELP)
     2182#if defined(VBOX_WITH_QHELP_VIEWER)
    21832183    /* First open or show the help browser: */
    21842184    showHelpBrowser(uiCommon().helpFile());
    … …  
    23782378{
    23792379    Q_UNUSED(pParent);
    2380 #if defined(VBOX_WITH_DOCS_QHELP)
     2380#if defined(VBOX_WITH_QHELP_VIEWER)
    23812381    if (!QFileInfo(strHelpFilePath).exists())
    23822382    {

  • trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserDialog.cpp

    r99859 r99860  
    7272void UIHelpBrowserDialog::showHelpForKeyword(const QString &strKeyword)
    7373{
    74 #ifdef VBOX_WITH_DOCS_QHELP
     74#ifdef VBOX_WITH_QHELP_VIEWER
    7575    if (m_pWidget)
    7676        m_pWidget->showHelpForKeyword(strKeyword);
    … …  
    8282void UIHelpBrowserDialog::retranslateUi()
    8383{
    84 #ifdef VBOX_WITH_DOCS_QHELP
     84#ifdef VBOX_WITH_QHELP_VIEWER
    8585    setWindowTitle(UIHelpBrowserWidget::tr("Oracle VM VirtualBox User Manual"));
    8686#endif
    … …  
    119119void UIHelpBrowserDialog::prepareCentralWidget()
    120120{
    121 #ifdef VBOX_WITH_DOCS_QHELP
     121#ifdef VBOX_WITH_QHELP_VIEWER
    122122    m_pWidget = new UIHelpBrowserWidget(EmbedTo_Dialog, m_strHelpFilePath);
    123123    AssertPtrReturnVoid(m_pWidget);

  • trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.cpp

    r99859 r99860  
    3030#include <QComboBox>
    3131#include <QtGlobal>
    32 #ifdef VBOX_WITH_DOCS_QHELP
     32#ifdef VBOX_WITH_QHELP_VIEWER
    3333# include <QtHelp/QHelpEngine>
    3434# include <QtHelp/QHelpContentWidget>
    … …  
    7070#include "CSystemProperties.h"
    7171
    72 #ifdef VBOX_WITH_DOCS_QHELP
     72#ifdef VBOX_WITH_QHELP_VIEWER
    7373
    7474enum HelpBrowserTabs
    … …  
    22752275#include "UIHelpBrowserWidget.moc"
    22762276
    2277 #endif /*#ifdef VBOX_WITH_DOCS_QHELP*/
     2277#endif /*#ifdef VBOX_WITH_QHELP_VIEWER*/

  • trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.h

    r99859 r99860  
    5858class UIZoomMenuAction;
    5959
    60 #ifdef VBOX_WITH_DOCS_QHELP
     60#ifdef VBOX_WITH_QHELP_VIEWER
    6161class SHARED_LIBRARY_STUFF UIHelpBrowserWidget  : public QIWithRetranslateUI<QWidget>
    6262{
    … …  
    220220};
    221221
    222 #endif /* #ifdef VBOX_WITH_DOCS_QHELP */
     222#endif /* #ifdef VBOX_WITH_QHELP_VIEWER */
    223223#endif /* !FEQT_INCLUDED_SRC_helpbrowser_UIHelpBrowserWidget_h */

  • trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.cpp

    r99859 r99860  
    2929#include <QClipboard>
    3030#include <QtGlobal>
    31 #ifdef VBOX_WITH_DOCS_QHELP
     31#ifdef VBOX_WITH_QHELP_VIEWER
    3232 #include <QtHelp/QHelpEngine>
    3333 #include <QtHelp/QHelpContentWidget>
    … …  
    6464#include "CSystemProperties.h"
    6565
    66 #ifdef VBOX_WITH_DOCS_QHELP
     66#ifdef VBOX_WITH_QHELP_VIEWER
    6767
    6868
    … …  
    10701070#include "UIHelpViewer.moc"
    10711071
    1072 #endif /* #ifdef VBOX_WITH_DOCS_QHELP */
     1072#endif /* #ifdef VBOX_WITH_QHELP_VIEWER */

  • trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.h

    r99859 r99860  
    4444class UIFindInPageWidget;
    4545
    46 #ifdef VBOX_WITH_DOCS_QHELP
     46#ifdef VBOX_WITH_QHELP_VIEWER
    4747
    4848/** A QTextBrowser extension used as poor man's html viewer. Since we were not happy with the quality of QTextBrowser's image
    … …  
    172172};
    173173
    174 #endif /* #ifdef VBOX_WITH_DOCS_QHELP */
     174#endif /* #ifdef VBOX_WITH_QHELP_VIEWER */
    175175#endif /* !FEQT_INCLUDED_SRC_helpbrowser_UIHelpViewer_h */
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette