aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/help/webenginehelpviewer.h
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@theqtcompany.com>2016-03-31 11:49:00 +0200
committerUlf Hermann <ulf.hermann@theqtcompany.com>2016-03-31 12:04:43 +0000
commit2ce3bf8ed49555d0bc6f69d63173338f80528016 (patch)
tree4e9c13a120d259ddd2c1803a81511962293bc96e /src/plugins/help/webenginehelpviewer.h
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 <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/plugins/help/webenginehelpviewer.h')
-rw-r--r--src/plugins/help/webenginehelpviewer.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/help/webenginehelpviewer.h b/src/plugins/help/webenginehelpviewer.h
index 7d777ab4875..ba8d0adfb38 100644
--- a/src/plugins/help/webenginehelpviewer.h
+++ b/src/plugins/help/webenginehelpviewer.h
@@ -40,10 +40,10 @@ public:
void requestStarted(QWebEngineUrlRequestJob *job) override;
};
-class HelpPage : public QWebEnginePage
+class WebEngineHelpPage : public QWebEnginePage
{
public:
- explicit HelpPage(QObject *parent = 0);
+ explicit WebEngineHelpPage(QObject *parent = 0);
QWebEnginePage *createWindow(QWebEnginePage::WebWindowType) override;
};
@@ -83,7 +83,7 @@ public:
void setOpenInNewPageActionVisible(bool visible) override;
bool findText(const QString &text, Core::FindFlags flags, bool incremental, bool fromSearch, bool *wrapped) override;
- HelpPage *page() const;
+ WebEngineHelpPage *page() const;
public slots:
void scaleUp() override;