From 1de3de31a7e7f574ab7c9d4f0fe49a761b56ae48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Fri, 5 Jun 2020 12:36:15 -0300 Subject: [PATCH] APMFirmwarePlugin: Add new errorOccurred for Qt 5.15 builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- src/FirmwarePlugin/APM/APMFirmwarePlugin.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc b/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc index dea652452..f5e303fc9 100644 --- a/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc +++ b/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc @@ -793,7 +793,11 @@ void APMFirmwarePlugin::_soloVideoHandshake(Vehicle* vehicle, bool originalSoloF socket->connectToHost(_artooIP, _artooVideoHandshakePort); if (originalSoloFirmware) { +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) QObject::connect(socket, static_cast(&QTcpSocket::error), this, &APMFirmwarePlugin::_artooSocketError); +#else + QObject::connect(socket, &QAbstractSocket::errorOccurred, this, &APMFirmwarePlugin::_artooSocketError); +#endif } } -- 2.22.0