1 files changed, 6 insertions, 2 deletions
diff --git a/src/base/QXmppStream.cpp b/src/base/QXmppStream.cpp
index b05499c4..54a7a630 100644
--- a/src/base/QXmppStream.cpp
+++ b/src/base/QXmppStream.cpp
@@ -188,7 +188,11 @@ void QXmppStream::setSocket(QSslSocket *socket)
     // socket events
     connect(socket, &QAbstractSocket::connected, this, &QXmppStream::_q_socketConnected);
     connect(socket, &QSslSocket::encrypted, this, &QXmppStream::_q_socketEncrypted);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+    connect(socket, &QSslSocket::errorOccurred, this, &QXmppStream::_q_socketError);
+#else
     connect(socket, QOverload<QAbstractSocket::SocketError>::of(&QSslSocket::error), this, &QXmppStream::_q_socketError);
+#endif
     connect(socket, &QIODevice::readyRead, this, &QXmppStream::_q_socketReadyRead);
 }
 
@@ -233,12 +237,12 @@ void QXmppStream::_q_socketReadyRead()
     QByteArray completeXml = d->dataBuffer;
     const QString strData = QString::fromUtf8(d->dataBuffer);
     bool streamStart = false;
-    if (d->streamStart.isEmpty() && strData.contains(startStreamRegex))
+    if (d->streamStart.isEmpty() && startStreamRegex.indexIn(strData) != -1)
         streamStart = true;
     else
         completeXml.prepend(d->streamStart);
     bool streamEnd = false;
-    if (strData.contains(endStreamRegex))
+    if (endStreamRegex.indexIn(strData) != -1)
         streamEnd = true;
     else
         completeXml.append(streamRootElementEnd);