Replace WtWbKit with QtWebEngine (#2554)

4 files changed, 16 insertions, 17 deletions

diff --git a/src/modules/help/HelpWidget.cpp b/src/modules/help/HelpWidget.cpp
index 51d0a4220..5bd05fcca 100644
--- a/src/modules/help/HelpWidget.cpp
+++ b/src/modules/help/HelpWidget.cpp
@@ -49,8 +49,6 @@ extern KviPointerList<HelpWidget> * g_pHelpWidgetList;
 #include <QShortcut>
 #include <QAction>
 
-#define HIGHLIGHT_FLAGS QWebPage::HighlightAllOccurrences
-
 HelpWidget::HelpWidget(QWidget * par, bool bIsStandalone)
     : QWidget(par)
 {
@@ -74,7 +72,7 @@ HelpWidget::HelpWidget(QWidget * par, bool bIsStandalone)
 	m_pLayout->addWidget(m_pToolBar);
 
 	// webview
-	m_pTextBrowser = new QWebView(this);
+	m_pTextBrowser = new QWebEngineView(this);
 	m_pTextBrowser->setObjectName("text_browser");
 	m_pTextBrowser->setStyleSheet("QTextBrowser { background-color:white; color:black; }");
 	m_pLayout->addWidget(m_pTextBrowser);
@@ -101,10 +99,10 @@ HelpWidget::HelpWidget(QWidget * par, bool bIsStandalone)
 	m_pToolBar->addAction(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPINDEX), __tr2qs("Show index"), this, SLOT(showIndex()));
 
 	QAction * pAction;
-	pAction = m_pTextBrowser->pageAction(QWebPage::Back);
+	pAction = m_pTextBrowser->pageAction(QWebEnginePage::Back);
 	pAction->setIcon(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPBACK));
 	m_pToolBar->addAction(pAction);
-	pAction = m_pTextBrowser->pageAction(QWebPage::Forward);
+	pAction = m_pTextBrowser->pageAction(QWebEnginePage::Forward);
 	pAction->setIcon(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPFORWARD));
 	m_pToolBar->addAction(pAction);
 
@@ -120,7 +118,7 @@ HelpWidget::HelpWidget(QWidget * par, bool bIsStandalone)
 
 void HelpWidget::slotCopy()
 {
-	m_pTextBrowser->triggerPageAction(QWebPage::Copy);
+	m_pTextBrowser->triggerPageAction(QWebEnginePage::Copy);
 }
 
 void HelpWidget::slotShowHideFind()
@@ -128,7 +126,7 @@ void HelpWidget::slotShowHideFind()
 	if(m_pToolBarHighlight->isVisible())
 	{
 		m_pToolBarHighlight->hide();
-		m_pTextBrowser->findText("", HIGHLIGHT_FLAGS);
+		m_pTextBrowser->findText("");
 	}
 	else
 	{
@@ -139,18 +137,18 @@ void HelpWidget::slotShowHideFind()
 
 void HelpWidget::slotLoadFinished(bool)
 {
-	m_pTextBrowser->findText(m_pFindText->text(), HIGHLIGHT_FLAGS);
+	m_pTextBrowser->findText(m_pFindText->text());
 }
 
 void HelpWidget::slotTextChanged(const QString szFind)
 {
-	m_pTextBrowser->findText("", HIGHLIGHT_FLAGS);
-	m_pTextBrowser->findText(szFind, HIGHLIGHT_FLAGS);
+	m_pTextBrowser->findText("");
+	m_pTextBrowser->findText(szFind);
 }
 
 void HelpWidget::slotFindPrev()
 {
-	m_pTextBrowser->findText(m_pFindText->text(), QWebPage::FindBackward);
+	m_pTextBrowser->findText(m_pFindText->text(), QWebEnginePage::FindBackward);
 }
 
 void HelpWidget::slotFindNext()
diff --git a/src/modules/help/HelpWidget.h b/src/modules/help/HelpWidget.h
index 75a91c683..49469f633 100644
--- a/src/modules/help/HelpWidget.h
+++ b/src/modules/help/HelpWidget.h
@@ -28,7 +28,7 @@
 #include "kvi_settings.h"
 
 #ifdef COMPILE_WEBKIT_SUPPORT
-#include <QtWebKitWidgets/QWebView>
+#include <QWebEngineView>
 #else
 #include <QTextBrowser>
 #endif
@@ -53,7 +53,7 @@ private:
 	QToolBar * m_pToolBar;
 	QToolBar * m_pToolBarHighlight;
 	QLineEdit * m_pFindText;
-	QWebView * m_pTextBrowser;
+	QWebEngineView * m_pTextBrowser;
 #else
 	QVBoxLayout * m_pLayout;
 	QToolBar * m_pToolBar;
@@ -77,7 +77,7 @@ protected slots:
 #endif
 public:
 #ifdef COMPILE_WEBKIT_SUPPORT
-	QWebView * textBrowser()
+	QWebEngineView * textBrowser()
 	{
 		return m_pTextBrowser;
 	}
diff --git a/src/modules/help/HelpWindow.cpp b/src/modules/help/HelpWindow.cpp
index 3f0219df9..308580023 100644
--- a/src/modules/help/HelpWindow.cpp
+++ b/src/modules/help/HelpWindow.cpp
@@ -52,6 +52,7 @@ HelpWindow::HelpWindow(const char * name)
     : KviWindow(KviWindow::Help, name)
 {
 	g_pHelpWindowList->append(this);
+	setMinimumSize(600, 500);
 	m_pSplitter = new KviTalSplitter(Qt::Horizontal, this);
 	m_pSplitter->setObjectName("main_splitter");
 	m_pSplitter->setChildrenCollapsible(false);
@@ -268,7 +269,7 @@ void HelpWindow::startSearch()
 }
 
 #ifdef COMPILE_WEBKIT_SUPPORT
-QWebView * HelpWindow::textBrowser()
+QWebEngineView * HelpWindow::textBrowser()
 #else
 QTextBrowser * HelpWindow::textBrowser()
 #endif
diff --git a/src/modules/help/HelpWindow.h b/src/modules/help/HelpWindow.h
index 865fb5fee..bdd115f33 100644
--- a/src/modules/help/HelpWindow.h
+++ b/src/modules/help/HelpWindow.h
@@ -32,7 +32,7 @@
 
 #include <QTabWidget>
 #ifdef COMPILE_WEBKIT_SUPPORT
-#include <QtWebKitWidgets/QWebView>
+#include <QWebEngineView>
 #else
 class QTextBrowser;
 #endif
@@ -80,7 +80,7 @@ protected:
 
 public:
 #ifdef COMPILE_WEBKIT_SUPPORT
-	QWebView * textBrowser();
+	QWebEngineView * textBrowser();
 #else
 	QTextBrowser * textBrowser();
 #endif