feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Help: Disambiguate the HelpPage classes from QtWebKit and WebEngine

Browse Source 
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 <kai.koehne@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2016-03-31 11:49:00 +02:00
parent 4707fc4945
commit 2ce3bf8ed4
4 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/help/webenginehelpviewer.cpp
View File

@@ -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();