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

Remove some obsolete code inside QT_VERSION_CHECK sections

Browse Source 
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 <eike.ziller@qt.io>
This commit is contained in:
Alessandro Portale
2018-04-25 13:24:28 +02:00
parent 4533015c66
commit 1dbdd259be
5 changed files with 2 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/help/webenginehelpviewer.cpp
View File

@@ -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);

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

@@ -46,9 +46,6 @@ class WebEngineHelpPage : public QWebEnginePage
{
public:
explicit WebEngineHelpPage(QObject *parent = nullptr);
#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
QWebEnginePage *createWindow(QWebEnginePage::WebWindowType) override;
#endif
};
class WebView : public QWebEngineView