diff options
author | Alessandro Portale <[email protected]> | 2018-04-25 13:24:28 +0200 |
---|---|---|
committer | Alessandro Portale <[email protected]> | 2018-04-27 07:43:49 +0000 |
commit | 1dbdd259bee717688a37812fa576b36585305b32 (patch) | |
tree | ee15dcdb3699c94415fc8bcc352597470083a40d /src/plugins/help/webenginehelpviewer.cpp | |
parent | 4533015c66e13955fc2425ed2f926e75e3e7a606 (diff) |
Remove some obsolete code inside QT_VERSION_CHECK sections
With Qt 5.9 as minimal build version, we don't need to handle 5.7 or 5.8
Change-Id: Ie1eed95ab46364452b0633f78bebc565a4a63f4a
Reviewed-by: Eike Ziller <[email protected]>
Diffstat (limited to 'src/plugins/help/webenginehelpviewer.cpp')
-rw-r--r-- | src/plugins/help/webenginehelpviewer.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/plugins/help/webenginehelpviewer.cpp b/src/plugins/help/webenginehelpviewer.cpp index 18c4d865d41..08d5f44e600 100644 --- a/src/plugins/help/webenginehelpviewer.cpp +++ b/src/plugins/help/webenginehelpviewer.cpp @@ -36,9 +36,7 @@ #include <QCoreApplication> #include <QTimer> #include <QVBoxLayout> -#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) #include <QWebEngineContextMenuData> -#endif #include <QWebEngineHistory> #include <QWebEngineProfile> #include <QWebEngineSettings> @@ -289,14 +287,6 @@ WebEngineHelpPage::WebEngineHelpPage(QObject *parent) { } -#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) -QWebEnginePage *WebEngineHelpPage::createWindow(QWebEnginePage::WebWindowType) -{ - auto viewer = static_cast<WebEngineHelpViewer *>(OpenPagesManager::instance().createPage()); - return viewer->page(); -} -#endif - WebView::WebView(WebEngineHelpViewer *viewer) : QWebEngineView(viewer), m_viewer(viewer) @@ -314,12 +304,6 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) // insert after ++it; QAction *before = (it == actions.cend() ? 0 : *it); -#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) - if (m_viewer->isActionVisible(HelpViewer::Action::NewPage)) { - QAction *openLinkInNewTab = page()->action(QWebEnginePage::OpenLinkInNewTab); - menu->insertAction(before, openLinkInNewTab); - } -#else QUrl url = page()->contextMenuData().linkUrl(); if (m_viewer->isActionVisible(HelpViewer::Action::NewPage)) { auto openLink = new QAction(QCoreApplication::translate("HelpViewer", @@ -337,7 +321,6 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) }); menu->insertAction(before, openLink); } -#endif } connect(menu, &QMenu::aboutToHide, menu, &QObject::deleteLater); |