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

Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739

1 files changed, 4 insertions, 4 deletions

diff --git a/tests/auto/network/socket/qlocalsocket/socketprocess/main.cpp b/tests/auto/network/socket/qlocalsocket/socketprocess/main.cpp
index 272e837ac5..6355fea6ab 100644
--- a/tests/auto/network/socket/qlocalsocket/socketprocess/main.cpp
+++ b/tests/auto/network/socket/qlocalsocket/socketprocess/main.cpp
@@ -65,8 +65,8 @@ bool runServer(int numberOfConnections)
             return false;
         }
         printf("server: data written\n");
-        if (socket->error() != QLocalSocket::UnknownSocketError) {
-            fprintf(stderr, "server: socket error %d\n", socket->error());
+        if (socket->socketError() != QLocalSocket::UnknownSocketError) {
+            fprintf(stderr, "server: socket error %d\n", socket->socketError());
             return false;
         }
     }
@@ -83,8 +83,8 @@ bool runClient()
         socket.connectToServer(serverName, QLocalSocket::ReadWrite);
         if (socket.waitForConnected())
             break;
-        if (socket.error() == QLocalSocket::ServerNotFoundError
-            || socket.error() == QLocalSocket::ConnectionRefusedError) {
+        if (socket.socketError() == QLocalSocket::ServerNotFoundError
+            || socket.socketError() == QLocalSocket::ConnectionRefusedError) {
             if (connectTimer.elapsed() > 5000) {
                 fprintf(stderr, "client: server not found or connection refused. Giving up.\n");
                 return false;