From a34736f3309575be60a02af2f05703353329319d Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 22 May 2015 09:02:59 +0200 Subject: QtWebKit HelpViewer: Fix that "Open in New Page" was visible where it shouldn't Change-Id: I707f348965cb66085e9e9b7b47613c65974a5f55 Reviewed-by: Allan Sandfeld Jensen --- src/plugins/help/qtwebkithelpviewer.cpp | 7 +------ src/plugins/help/qtwebkithelpviewer.h | 3 --- 2 files changed, 1 insertion(+), 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 -- cgit v1.2.1