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

Timestamp:

Nov 2, 2020 2:12:51 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Putting qt version checks around search engine etc.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser

Files:

• UIHelpBrowserWidget.cpp (modified) (13 diffs)
• UIHelpBrowserWidget.h (modified) (1 diff)

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

@@ -22 +22 @@
 #include <QFont>
 #include <QHBoxLayout>
-#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP)
+#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
  #include <QtHelp/QHelpEngine>
  #include <QtHelp/QHelpContentWidget>
  #include <QtHelp/QHelpIndexWidget>
-#include <QtHelp/QHelpSearchEngine>
-#include <QtHelp/QHelpSearchQueryWidget>
-#include <QtHelp/QHelpSearchResultWidget>
+ #include <QtHelp/QHelpSearchEngine>
+ #include <QtHelp/QHelpSearchQueryWidget>
+ #include <QtHelp/QHelpSearchResultWidget>
 #endif
 #include <QMenu>
@@ -91 +91 @@
 private:
 
-#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP)
+#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
     const QHelpEngine* m_pHelpEngine;
 #endif
@@ -103 +103 @@
 UIHelpBrowserViewer::UIHelpBrowserViewer(const QHelpEngine *pHelpEngine, QWidget *pParent /* = 0 */)
     :QTextBrowser(pParent)
-#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP)
+#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
     , m_pHelpEngine(pHelpEngine)
 #endif
 {
-#if !defined(RT_OS_LINUX) || !defined(VBOX_WITH_DOCS_QHELP)
+#if !defined(RT_OS_LINUX) || !defined(VBOX_WITH_DOCS_QHELP) || !(QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
     Q_UNUSED(pHelpEngine);
 #endif
@@ -114 +114 @@
 QVariant UIHelpBrowserViewer::loadResource(int type, const QUrl &name)
 {
-#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP)
+#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
     if (name.scheme() == "qthelp" && m_pHelpEngine)
         return QVariant(m_pHelpEngine->fileData(name));
@@ -143 +143 @@
     , m_pToolBar(0)
     , m_strHelpFilePath(strHelpFilePath)
-#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP)
+#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
     , m_pHelpEngine(0)
 #endif
@@ -240 +240 @@
 
     m_pMainLayout->addWidget(m_pSplitter);
-#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP)
+#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
     m_pHelpEngine = new QHelpEngine(m_strHelpFilePath, this);
     m_pBookmarksWidget = new QWidget(this);
@@ -302 +302 @@
 void UIHelpBrowserWidget::prepareSearchWidgets()
 {
-#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP)
+#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
 # if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
 
@@ -397 +397 @@
 void UIHelpBrowserWidget::loadOptions()
 {
-#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP)
+#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
     if (m_pContentViewer && m_pHelpEngine)
     {
@@ -512 +512 @@
 QUrl UIHelpBrowserWidget::findIndexHtml() const
 {
-#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP)
+#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
     QList<QUrl> files = m_pHelpEngine->files(m_pHelpEngine->namespaceName(m_strHelpFilePath), QStringList());
     int iIndex = -1;
@@ -552 +552 @@
 void UIHelpBrowserWidget::sltHandleHelpEngineSetupFinished()
 {
-#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP)
+#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
     AssertReturnVoid(m_pContentViewer && m_pHelpEngine);
     /* Search for the index of the index.htnl: */
@@ -567 +567 @@
 void UIHelpBrowserWidget::sltHandleContentWidgetItemClicked(const QModelIndex &index)
 {
-#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP)
+#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
     AssertReturnVoid(m_pContentViewer && m_pHelpEngine && m_pContentWidget);
     QHelpContentModel *pContentModel =
@@ -589 +589 @@
 void UIHelpBrowserWidget::sltHandleHelpBrowserViewerSourceChange(const QUrl &source)
 {
-#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP)
+#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
     if (m_fModelContentCreated && m_pContentWidget && source.isValid() && m_pContentModel)
     {
@@ -714 +714 @@
 void UIHelpBrowserWidget::sltHandleSearchStart()
 {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
+#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
     AssertReturnVoid(m_pHelpSearchEngine && m_pHelpSearchQueryWidget);
     m_pHelpSearchEngine->search(m_pHelpSearchQueryWidget->searchInput());

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

@@ -148 +148 @@
 
     QString       m_strHelpFilePath;
-#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP)
+#if defined(RT_OS_LINUX) && defined(VBOX_WITH_DOCS_QHELP) && (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
     QHelpEngine  *m_pHelpEngine;
 #endif