Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I469b0501cc65fc5ce4d797a69ae89405cc69c7f8

1 files changed, 2 insertions, 3 deletions

diff --git a/examples/network/loopback/dialog.cpp b/examples/network/loopback/dialog.cpp
index d87f024031..4037f4c085 100644
--- a/examples/network/loopback/dialog.cpp
+++ b/examples/network/loopback/dialog.cpp
@@ -78,7 +78,7 @@ Dialog::Dialog(QWidget *parent)
     connect(&tcpClient, &QAbstractSocket::connected, this, &Dialog::startTransfer);
     connect(&tcpClient, &QIODevice::bytesWritten,
             this, &Dialog::updateClientProgress);
-    connect(&tcpClient, QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error),
+    connect(&tcpClient, &QAbstractSocket::errorOccurred,
             this, &Dialog::displayError);
 
     QVBoxLayout *mainLayout = new QVBoxLayout;
@@ -131,8 +131,7 @@ void Dialog::acceptConnection()
 
     connect(tcpServerConnection, &QIODevice::readyRead,
             this, &Dialog::updateServerProgress);
-    connect(tcpServerConnection,
-            QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error),
+    connect(tcpServerConnection, &QAbstractSocket::errorOccurred,
             this, &Dialog::displayError);
     connect(tcpServerConnection, &QTcpSocket::disconnected,
             tcpServerConnection, &QTcpSocket::deleteLater);