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

6
src/plugins/help/webenginehelpviewer.h
View File

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