feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QtWebKit HelpViewer: Fix that "Open in New Page" was visible where it shouldn't

Browse Source 
Change-Id: I707f348965cb66085e9e9b7b47613c65974a5f55
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
This commit is contained in:
Eike Ziller
2015-05-22 09:02:59 +02:00
parent 8f39e05e40
commit a34736f330
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/help/qtwebkithelpviewer.cpp
View File

@@ -294,11 +294,6 @@ void QtWebKitHelpWidget::scaleDown()
setZoomFactor(qMax(qreal(0.0), zoomFactor() - qreal(0.1))); setZoomFactor(qMax(qreal(0.0), zoomFactor() - qreal(0.1)));
} }
void QtWebKitHelpWidget::setOpenInNewPageActionVisible(bool visible)
{
m_openInNewPageActionVisible = visible;
}
// -- public slots // -- public slots
void QtWebKitHelpWidget::copy() void QtWebKitHelpWidget::copy()
@@ -567,7 +562,7 @@ void QtWebKitHelpViewer::addForwardHistoryItems(QMenu *forwardMenu)
void QtWebKitHelpViewer::setOpenInNewPageActionVisible(bool visible) void QtWebKitHelpViewer::setOpenInNewPageActionVisible(bool visible)
{ {
m_webView->setOpenInNewPageActionVisible(visible); m_webView->pageAction(QWebPage::OpenLinkInNewWindow)->setVisible(visible);
} }
bool QtWebKitHelpViewer::findText(const QString &text, FindFlags flags, bool QtWebKitHelpViewer::findText(const QString &text, FindFlags flags,

3
src/plugins/help/qtwebkithelpviewer.h
View File

@@ -110,8 +110,6 @@ public:
void scaleUp(); void scaleUp();
void scaleDown(); void scaleDown();
void setOpenInNewPageActionVisible(bool visible);
public slots: public slots:
void copy(); void copy();
@@ -134,7 +132,6 @@ private:
bool eventFilter(QObject *obj, QEvent *event); bool eventFilter(QObject *obj, QEvent *event);
QtWebKitHelpViewer *m_parent; QtWebKitHelpViewer *m_parent;
bool m_openInNewPageActionVisible;
}; };
class HelpPage : public QWebPage class HelpPage : public QWebPage