diff options
| -rw-r--r-- | src/plugins/android/androidconfigurations.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/help/webenginehelpviewer.cpp | 17 | ||||
| -rw-r--r-- | src/plugins/help/webenginehelpviewer.h | 3 | ||||
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilertraceview.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/serialterminal/serialcontrol.cpp | 7 |
5 files changed, 2 insertions, 34 deletions
diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 92507cd9be..c281f25dda 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -1228,13 +1228,12 @@ void AndroidConfigurations::load() QSettings::NativeFormat)); allVersions = settings->childGroups(); #ifdef Q_OS_WIN -#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) if (allVersions.isEmpty()) { settings.reset(new QSettings(jdkSettingsPath, QSettings::Registry64Format)); allVersions = settings->childGroups(); } -#endif -#endif +#endif // Q_OS_WIN + QString javaHome; int major = -1; int minor = -1; diff --git a/src/plugins/help/webenginehelpviewer.cpp b/src/plugins/help/webenginehelpviewer.cpp index 18c4d865d4..08d5f44e60 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); diff --git a/src/plugins/help/webenginehelpviewer.h b/src/plugins/help/webenginehelpviewer.h index e060c8d718..cffe26af21 100644 --- a/src/plugins/help/webenginehelpviewer.h +++ b/src/plugins/help/webenginehelpviewer.h @@ -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 diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp index 3eb963d95f..d654869f20 100644 --- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp @@ -295,12 +295,8 @@ void QmlProfilerTraceView::showContextMenu(QPoint position) bool QmlProfilerTraceView::isUsable() const { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) return d->m_mainView->quickWindow()->rendererInterface()->graphicsApi() == QSGRendererInterface::OpenGL; -#else - return true; -#endif } bool QmlProfilerTraceView::isSuspended() const diff --git a/src/plugins/serialterminal/serialcontrol.cpp b/src/plugins/serialterminal/serialcontrol.cpp index 28d86a597e..e3ca879a0c 100644 --- a/src/plugins/serialterminal/serialcontrol.cpp +++ b/src/plugins/serialterminal/serialcontrol.cpp @@ -52,15 +52,8 @@ SerialControl::SerialControl(const Settings &settings, QObject *parent) : connect(&m_serialPort, &QSerialPort::readyRead, this, &SerialControl::handleReadyRead); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)) connect(&m_serialPort, &QSerialPort::errorOccurred, this, &SerialControl::handleError); -#else - connect(&m_serialPort, - static_cast<void (QSerialPort::*)(QSerialPort::SerialPortError)>(&QSerialPort::error), - this, &SerialControl::handleError); -#endif - connect(&m_reconnectTimer, &QTimer::timeout, this, &SerialControl::reconnectTimeout); } |