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

 Conflicts:
	examples/widgets/graphicsview/boxes/scene.h
	src/corelib/Qt5CoreMacros.cmake
	src/corelib/Qt6CoreMacros.cmake
	src/network/ssl/qsslsocket.cpp
	src/network/ssl/qsslsocket.h
	src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp
	src/testlib/CMakeLists.txt
	src/testlib/.prev_CMakeLists.txt
	tests/auto/corelib/tools/qscopeguard/tst_qscopeguard.cpp

Disabled building manual tests with CMake for now, because qmake
doesn't do it, and it confuses people.

Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Done-With: Volker Hilsheimer <volker.hilsheimer@qt.io>
Change-Id: I865ae347bd01f4e59f16d007b66d175a52f1f152

1 files changed, 17 insertions, 24 deletions

diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp
index 2e2eb7dee9..e860b880d5 100644
--- a/src/network/socket/qlocalsocket_unix.cpp
+++ b/src/network/socket/qlocalsocket_unix.cpp
@@ -99,7 +99,7 @@ void QLocalSocketPrivate::_q_error(QAbstractSocket::SocketError socketError)
     QLocalSocket::LocalSocketError error = (QLocalSocket::LocalSocketError)socketError;
     QString errorString = generateErrorString(error, function);
     q->setErrorString(errorString);
-    emit q->error(error);
+    emit q->errorOccurred(error);
 }
 
 void QLocalSocketPrivate::_q_stateChanged(QAbstractSocket::SocketState newState)
@@ -172,7 +172,7 @@ QString QLocalSocketPrivate::generateErrorString(QLocalSocket::LocalSocketError
     return errorString;
 }
 
-void QLocalSocketPrivate::errorOccurred(QLocalSocket::LocalSocketError error, const QString &function)
+void QLocalSocketPrivate::setErrorAndEmit(QLocalSocket::LocalSocketError error, const QString &function)
 {
     Q_Q(QLocalSocket);
     switch (error) {
@@ -210,7 +210,7 @@ void QLocalSocketPrivate::errorOccurred(QLocalSocket::LocalSocketError error, co
 
     QString errorString = generateErrorString(error, function);
     q->setErrorString(errorString);
-    emit q->error(error);
+    emit q->errorOccurred(error);
 
     // errors cause a disconnect
     unixSocket.setSocketState(QAbstractSocket::UnconnectedState);
@@ -227,7 +227,7 @@ void QLocalSocket::connectToServer(OpenMode openMode)
     if (state() == ConnectedState || state() == ConnectingState) {
         QString errorString = d->generateErrorString(QLocalSocket::OperationError, QLatin1String("QLocalSocket::connectToserver"));
         setErrorString(errorString);
-        emit error(QLocalSocket::OperationError);
+        emit errorOccurred(QLocalSocket::OperationError);
         return;
     }
 
@@ -237,15 +237,15 @@ void QLocalSocket::connectToServer(OpenMode openMode)
     emit stateChanged(d->state);
 
     if (d->serverName.isEmpty()) {
-        d->errorOccurred(ServerNotFoundError,
-                QLatin1String("QLocalSocket::connectToServer"));
+        d->setErrorAndEmit(ServerNotFoundError,
+                           QLatin1String("QLocalSocket::connectToServer"));
         return;
     }
 
     // create the socket
     if (-1 == (d->connectingSocket = qt_safe_socket(PF_UNIX, SOCK_STREAM, 0, O_NONBLOCK))) {
-        d->errorOccurred(UnsupportedSocketOperationError,
-                        QLatin1String("QLocalSocket::connectToServer"));
+        d->setErrorAndEmit(UnsupportedSocketOperationError,
+                           QLatin1String("QLocalSocket::connectToServer"));
         return;
     }
 
@@ -281,7 +281,7 @@ void QLocalSocketPrivate::_q_connectToSocket()
     name.sun_family = PF_UNIX;
     if (sizeof(name.sun_path) < (uint)encodedConnectingPathName.size() + 1) {
         QString function = QLatin1String("QLocalSocket::connectToServer");
-        errorOccurred(QLocalSocket::ServerNotFoundError, function);
+        setErrorAndEmit(QLocalSocket::ServerNotFoundError, function);
         return;
     }
     ::memcpy(name.sun_path, encodedConnectingPathName.constData(),
@@ -292,17 +292,17 @@ void QLocalSocketPrivate::_q_connectToSocket()
         {
         case EINVAL:
         case ECONNREFUSED:
-            errorOccurred(QLocalSocket::ConnectionRefusedError, function);
+            setErrorAndEmit(QLocalSocket::ConnectionRefusedError, function);
             break;
         case ENOENT:
-            errorOccurred(QLocalSocket::ServerNotFoundError, function);
+            setErrorAndEmit(QLocalSocket::ServerNotFoundError, function);
             break;
         case EACCES:
         case EPERM:
-            errorOccurred(QLocalSocket::SocketAccessError, function);
+            setErrorAndEmit(QLocalSocket::SocketAccessError, function);
             break;
         case ETIMEDOUT:
-            errorOccurred(QLocalSocket::SocketTimeoutError, function);
+            setErrorAndEmit(QLocalSocket::SocketTimeoutError, function);
             break;
         case EAGAIN:
             // Try again later, all of the sockets listening are full
@@ -320,7 +320,7 @@ void QLocalSocketPrivate::_q_connectToSocket()
             delayConnect->setEnabled(true);
             break;
         default:
-            errorOccurred(QLocalSocket::UnknownSocketError, function);
+            setErrorAndEmit(QLocalSocket::UnknownSocketError, function);
         }
         return;
     }
@@ -336,7 +336,7 @@ void QLocalSocketPrivate::_q_connectToSocket()
         q->emit connected();
     } else {
         QString function = QLatin1String("QLocalSocket::connectToServer");
-        errorOccurred(QLocalSocket::UnknownSocketError, function);
+        setErrorAndEmit(QLocalSocket::UnknownSocketError, function);
     }
     connectingSocket = -1;
     connectingName.clear();
@@ -461,15 +461,8 @@ void QLocalSocket::disconnectFromServer()
     d->unixSocket.disconnectFromHost();
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
 QLocalSocket::LocalSocketError QLocalSocket::error() const
 {
-    return socketError();
-}
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
-QLocalSocket::LocalSocketError QLocalSocket::socketError() const
-{
     Q_D(const QLocalSocket);
     switch (d->unixSocket.socketError()) {
     case QAbstractSocket::ConnectionRefusedError:
@@ -536,8 +529,8 @@ bool QLocalSocket::waitForConnected(int msec)
         const int result = qt_poll_msecs(&pfd, 1, timeout);
 
         if (result == -1)
-            d->errorOccurred(QLocalSocket::UnknownSocketError,
-                             QLatin1String("QLocalSocket::waitForConnected"));
+            d->setErrorAndEmit(QLocalSocket::UnknownSocketError,
+                               QLatin1String("QLocalSocket::waitForConnected"));
         else if (result > 0)
             d->_q_connectToSocket();
     } while (state() == ConnectingState && !timer.hasExpired(msec));