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

5
src/plugins/android/androidconfigurations.cpp
View File

@@ -1228,13 +1228,12 @@ void AndroidConfigurations::load()
QSettings::NativeFormat)); QSettings::NativeFormat));
allVersions = settings->childGroups(); allVersions = settings->childGroups();
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
if (allVersions.isEmpty()) { if (allVersions.isEmpty()) {
settings.reset(new QSettings(jdkSettingsPath, QSettings::Registry64Format)); settings.reset(new QSettings(jdkSettingsPath, QSettings::Registry64Format));
allVersions = settings->childGroups(); allVersions = settings->childGroups();
} }
#endif #endif // Q_OS_WIN
#endif
QString javaHome; QString javaHome;
int major = -1; int major = -1;
int minor = -1; int minor = -1;

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

@@ -36,9 +36,7 @@
#include <QCoreApplication> #include <QCoreApplication>
#include <QTimer> #include <QTimer>
#include <QVBoxLayout> #include <QVBoxLayout>
#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
#include <QWebEngineContextMenuData> #include <QWebEngineContextMenuData>
#endif
#include <QWebEngineHistory> #include <QWebEngineHistory>
#include <QWebEngineProfile> #include <QWebEngineProfile>
#include <QWebEngineSettings> #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) WebView::WebView(WebEngineHelpViewer *viewer)
: QWebEngineView(viewer), : QWebEngineView(viewer),
m_viewer(viewer) m_viewer(viewer)
@@ -314,12 +304,6 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
// insert after // insert after
++it; ++it;
QAction *before = (it == actions.cend() ? 0 : *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(); QUrl url = page()->contextMenuData().linkUrl();
if (m_viewer->isActionVisible(HelpViewer::Action::NewPage)) { if (m_viewer->isActionVisible(HelpViewer::Action::NewPage)) {
auto openLink = new QAction(QCoreApplication::translate("HelpViewer", auto openLink = new QAction(QCoreApplication::translate("HelpViewer",
@@ -337,7 +321,6 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
}); });
menu->insertAction(before, openLink); menu->insertAction(before, openLink);
} }
#endif
} }
connect(menu, &QMenu::aboutToHide, menu, &QObject::deleteLater); connect(menu, &QMenu::aboutToHide, menu, &QObject::deleteLater);

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

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

4
src/plugins/qmlprofiler/qmlprofilertraceview.cpp
View File

@@ -295,12 +295,8 @@ void QmlProfilerTraceView::showContextMenu(QPoint position)
bool QmlProfilerTraceView::isUsable() const bool QmlProfilerTraceView::isUsable() const
{ {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
return d->m_mainView->quickWindow()->rendererInterface()->graphicsApi() return d->m_mainView->quickWindow()->rendererInterface()->graphicsApi()
== QSGRendererInterface::OpenGL; == QSGRendererInterface::OpenGL;
#else
return true;
#endif
} }
bool QmlProfilerTraceView::isSuspended() const bool QmlProfilerTraceView::isSuspended() const

7
src/plugins/serialterminal/serialcontrol.cpp
View File

@@ -52,15 +52,8 @@ SerialControl::SerialControl(const Settings &settings, QObject *parent) :
connect(&m_serialPort, &QSerialPort::readyRead, connect(&m_serialPort, &QSerialPort::readyRead,
this, &SerialControl::handleReadyRead); this, &SerialControl::handleReadyRead);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
connect(&m_serialPort, &QSerialPort::errorOccurred, connect(&m_serialPort, &QSerialPort::errorOccurred,
this, &SerialControl::handleError); this, &SerialControl::handleError);
#else
connect(&m_serialPort,
static_cast<void (QSerialPort::*)(QSerialPort::SerialPortError)>(&QSerialPort::error),
this, &SerialControl::handleError);
#endif
connect(&m_reconnectTimer, &QTimer::timeout, connect(&m_reconnectTimer, &QTimer::timeout,
this, &SerialControl::reconnectTimeout); this, &SerialControl::reconnectTimeout);
} }