diff --git a/mythtv/libs/libmythbase/http/mythhttps.cpp b/mythtv/libs/libmythbase/http/mythhttps.cpp index eb831c89899..1e5967822b7 100644 --- a/mythtv/libs/libmythbase/http/mythhttps.cpp +++ b/mythtv/libs/libmythbase/http/mythhttps.cpp @@ -134,7 +134,7 @@ void MythHTTPS::InitSSLSocket(QSslSocket *Socket, QSslConfiguration& Config) }; QObject::connect(Socket, &QSslSocket::encrypted, std::bind(Encrypted, Socket)); - QObject::connect(Socket, QOverload &>::of(&QSslSocket::sslErrors), SSLErrors); + QObject::connect(Socket, qOverload &>(&QSslSocket::sslErrors), SSLErrors); Socket->setSslConfiguration(Config); Socket->startServerEncryption(); } diff --git a/mythtv/libs/libmythbase/http/mythhttpsocket.cpp b/mythtv/libs/libmythbase/http/mythhttpsocket.cpp index ec727738b5d..afc703cfba0 100644 --- a/mythtv/libs/libmythbase/http/mythhttpsocket.cpp +++ b/mythtv/libs/libmythbase/http/mythhttpsocket.cpp @@ -57,8 +57,12 @@ MythHTTPSocket::MythHTTPSocket(qintptr Socket, bool SSL, const MythHTTPConfig& C connect(m_socket, &QTcpSocket::bytesWritten, this, &MythHTTPSocket::Write); connect(m_socket, &QTcpSocket::disconnected, this, &MythHTTPSocket::Disconnected); connect(m_socket, &QTcpSocket::disconnected, QThread::currentThread(), &QThread::quit); - connect(m_socket, QOverload::of(&QTcpSocket::error), +#if QT_VERSION < QT_VERSION_CHECK(5,15,0) + connect(m_socket, qOverload(&QTcpSocket::error), this, &MythHTTPSocket::Error); +#else + connect(m_socket, &QTcpSocket::errorOccurred, this, &MythHTTPSocket::Error); +#endif m_socket->setSocketDescriptor(m_socketFD); #ifndef QT_NO_OPENSSL diff --git a/mythtv/libs/libmythtv/mythplayeroverlayui.cpp b/mythtv/libs/libmythtv/mythplayeroverlayui.cpp index 8969544f0c7..27eb13a5cbf 100644 --- a/mythtv/libs/libmythtv/mythplayeroverlayui.cpp +++ b/mythtv/libs/libmythtv/mythplayeroverlayui.cpp @@ -18,7 +18,7 @@ MythPlayerOverlayUI::MythPlayerOverlayUI(MythMainWindow* MainWindow, TV* Tv, Pla m_positionUpdateTimer.setInterval(999ms); connect(&m_positionUpdateTimer, &QTimer::timeout, this, &MythPlayerOverlayUI::UpdateOSDPosition); connect(this, &MythPlayerOverlayUI::OverlayStateChanged, m_tv, &TV::OverlayStateChanged); - connect(m_tv, &TV::ChangeOSDMessage, this, QOverload::of(&MythPlayerOverlayUI::UpdateOSDMessage)); + connect(m_tv, &TV::ChangeOSDMessage, this, qOverload(&MythPlayerOverlayUI::UpdateOSDMessage)); // Signalled directly from TV to OSD connect(m_tv, &TV::DialogQuit, &m_osd, &OSD::DialogQuit); diff --git a/mythtv/libs/libmythtv/mythplayervideoui.cpp b/mythtv/libs/libmythtv/mythplayervideoui.cpp index 549cdb89ebe..2bc66b24de5 100644 --- a/mythtv/libs/libmythtv/mythplayervideoui.cpp +++ b/mythtv/libs/libmythtv/mythplayervideoui.cpp @@ -68,7 +68,7 @@ bool MythPlayerVideoUI::InitVideo() connect(video, &MythVideoOutputGPU::PictureAttributesUpdated, this, &MythPlayerVideoUI::PictureAttributesUpdated); connect(video, &MythVideoBounds::UpdateOSDMessage, - this, QOverload::of(&MythPlayerVideoUI::UpdateOSDMessage)); + this, qOverload(&MythPlayerVideoUI::UpdateOSDMessage)); connect(video, &MythVideoBounds::VideoBoundsStateChanged, m_tv, &TV::VideoBoundsStateChanged); connect(m_tv, &TV::ChangeOSDPositionUpdates, this, &MythPlayerVideoUI::ChangeOSDPositionUpdates);