aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/help/webenginehelpviewer.h
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2016-09-09 15:37:01 +0200
committerEike Ziller <eike.ziller@qt.io>2016-09-23 11:26:07 +0000
commita416a5b6e3e0d0c038276f1093cc5a1a770c3d5c (patch)
tree0e17342fcaba4a066e8348dc8c51f28bae9f2db2 /src/plugins/help/webenginehelpviewer.h
parent2cd307a7b007ef7752d0797d6e99492e797fa0a2 (diff)
Help: Option to open links in window
Task-number: QTCREATORBUG-16842 Change-Id: I420f48a00c56ebc89bade7e91ceb8ec391316e36 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'src/plugins/help/webenginehelpviewer.h')
-rw-r--r--src/plugins/help/webenginehelpviewer.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/help/webenginehelpviewer.h b/src/plugins/help/webenginehelpviewer.h
index 1674258a71d..d5835c4d6a0 100644
--- a/src/plugins/help/webenginehelpviewer.h
+++ b/src/plugins/help/webenginehelpviewer.h
@@ -33,6 +33,8 @@
namespace Help {
namespace Internal {
+class WebEngineHelpViewer;
+
class HelpUrlSchemeHandler : public QWebEngineUrlSchemeHandler
{
public:
@@ -44,21 +46,21 @@ class WebEngineHelpPage : public QWebEnginePage
{
public:
explicit WebEngineHelpPage(QObject *parent = 0);
+#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
QWebEnginePage *createWindow(QWebEnginePage::WebWindowType) override;
+#endif
};
class WebView : public QWebEngineView
{
public:
- explicit WebView(QWidget *parent = 0);
-
- void setOpenInNewPageActionVisible(bool visible);
+ explicit WebView(WebEngineHelpViewer *viewer);
protected:
void contextMenuEvent(QContextMenuEvent *event) override;
private:
- bool m_openInNewPageActionVisible = true;
+ WebEngineHelpViewer *m_viewer;
};
class WebEngineHelpViewer : public HelpViewer
@@ -80,7 +82,6 @@ public:
bool isBackwardAvailable() const override;
void addBackHistoryItems(QMenu *backMenu) override;
void addForwardHistoryItems(QMenu *forwardMenu) override;
- void setOpenInNewPageActionVisible(bool visible) override;
bool findText(const QString &text, Core::FindFlags flags, bool incremental, bool fromSearch, bool *wrapped) override;
WebEngineHelpPage *page() const;