diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-05-22 09:02:59 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-05-26 06:13:15 +0000 |
| commit | a34736f3309575be60a02af2f05703353329319d (patch) | |
| tree | 797019276b342ebf1979b4420b335866a9cfba9a | |
| parent | 8f39e05e40fa1d7fe3ca45942f39c9848f10015b (diff) | |
| download | qt-creator-a34736f3309575be60a02af2f05703353329319d.tar.gz | |
QtWebKit HelpViewer: Fix that "Open in New Page" was visible where it shouldn't
Change-Id: I707f348965cb66085e9e9b7b47613c65974a5f55
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| -rw-r--r-- | src/plugins/help/qtwebkithelpviewer.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/help/qtwebkithelpviewer.h | 3 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/plugins/help/qtwebkithelpviewer.cpp b/src/plugins/help/qtwebkithelpviewer.cpp index fe2c0d5647..b4d1d33724 100644 --- a/src/plugins/help/qtwebkithelpviewer.cpp +++ b/src/plugins/help/qtwebkithelpviewer.cpp @@ -294,11 +294,6 @@ void QtWebKitHelpWidget::scaleDown() setZoomFactor(qMax(qreal(0.0), zoomFactor() - qreal(0.1))); } -void QtWebKitHelpWidget::setOpenInNewPageActionVisible(bool visible) -{ - m_openInNewPageActionVisible = visible; -} - // -- public slots void QtWebKitHelpWidget::copy() @@ -567,7 +562,7 @@ void QtWebKitHelpViewer::addForwardHistoryItems(QMenu *forwardMenu) void QtWebKitHelpViewer::setOpenInNewPageActionVisible(bool visible) { - m_webView->setOpenInNewPageActionVisible(visible); + m_webView->pageAction(QWebPage::OpenLinkInNewWindow)->setVisible(visible); } bool QtWebKitHelpViewer::findText(const QString &text, FindFlags flags, diff --git a/src/plugins/help/qtwebkithelpviewer.h b/src/plugins/help/qtwebkithelpviewer.h index 669455fcb9..18759e38c1 100644 --- a/src/plugins/help/qtwebkithelpviewer.h +++ b/src/plugins/help/qtwebkithelpviewer.h @@ -110,8 +110,6 @@ public: void scaleUp(); void scaleDown(); - void setOpenInNewPageActionVisible(bool visible); - public slots: void copy(); @@ -134,7 +132,6 @@ private: bool eventFilter(QObject *obj, QEvent *event); QtWebKitHelpViewer *m_parent; - bool m_openInNewPageActionVisible; }; class HelpPage : public QWebPage |