aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/help/webenginehelpviewer.cpp
diff options
context:
space:
mode:
authorUlf Hermann <[email protected]>2016-03-31 11:49:00 +0200
committerUlf Hermann <[email protected]>2016-03-31 12:04:43 +0000
commit2ce3bf8ed49555d0bc6f69d63173338f80528016 (patch)
tree4e9c13a120d259ddd2c1803a81511962293bc96e /src/plugins/help/webenginehelpviewer.cpp
parent4707fc494557f331fc8e619003d9b6be9abbb790 (diff)
Help: Disambiguate the HelpPage classes from QtWebKit and WebEngine
This way the help viewers can coexist and the building against a version of Qt that has both webkit and webengine available doesn't fail anymore. Change-Id: I2de00b03fc7b127899cbf90b91fc2cfb090a47a5 Reviewed-by: Kai Koehne <[email protected]>
Diffstat (limited to 'src/plugins/help/webenginehelpviewer.cpp')
-rw-r--r--src/plugins/help/webenginehelpviewer.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/help/webenginehelpviewer.cpp b/src/plugins/help/webenginehelpviewer.cpp
index 5d2e2d2f356..55ebc4e57e9 100644
--- a/src/plugins/help/webenginehelpviewer.cpp
+++ b/src/plugins/help/webenginehelpviewer.cpp
@@ -73,7 +73,7 @@ WebEngineHelpViewer::WebEngineHelpViewer(QWidget *parent) :
HelpViewer(parent),
m_widget(new WebView(this))
{
- m_widget->setPage(new HelpPage(this));
+ m_widget->setPage(new WebEngineHelpPage(this));
auto layout = new QVBoxLayout;
setLayout(layout);
layout->setContentsMargins(0, 0, 0, 0);
@@ -226,9 +226,9 @@ bool WebEngineHelpViewer::findText(const QString &text, Core::FindFlags flags, b
return true;
}
-HelpPage *WebEngineHelpViewer::page() const
+WebEngineHelpPage *WebEngineHelpViewer::page() const
{
- return static_cast<HelpPage *>(m_widget->page());
+ return static_cast<WebEngineHelpPage *>(m_widget->page());
}
void WebEngineHelpViewer::scaleUp()
@@ -271,12 +271,12 @@ void WebEngineHelpViewer::print(QPrinter *printer)
Q_UNUSED(printer)
}
-HelpPage::HelpPage(QObject *parent)
+WebEngineHelpPage::WebEngineHelpPage(QObject *parent)
: QWebEnginePage(parent)
{
}
-QWebEnginePage *HelpPage::createWindow(QWebEnginePage::WebWindowType)
+QWebEnginePage *WebEngineHelpPage::createWindow(QWebEnginePage::WebWindowType)
{
auto viewer = static_cast<WebEngineHelpViewer *>(OpenPagesManager::instance().createPage());
return viewer->page();