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

Conflicts:
	.qmake.conf

Change-Id: If50b73b1f1e293269404bd8b38088119a0f59f1f

1 files changed, 9 insertions, 5 deletions

diff --git a/src/websockets/qwebsocketdataprocessor.cpp b/src/websockets/qwebsocketdataprocessor.cpp
index 520ecdc..d9fc550 100644
--- a/src/websockets/qwebsocketdataprocessor.cpp
+++ b/src/websockets/qwebsocketdataprocessor.cpp
@@ -182,12 +182,16 @@ void QWebSocketDataProcessor::process(QIODevice *pIoDevice)
                 }
 
                 if (frame.isFinalFrame()) {
-                    if (m_opCode == QWebSocketProtocol::OpCodeText)
-                        Q_EMIT textMessageReceived(m_textMessage);
-                    else
-                        Q_EMIT binaryMessageReceived(m_binaryMessage);
-                    clear();
                     isDone = true;
+                    if (m_opCode == QWebSocketProtocol::OpCodeText) {
+                        const QString textMessage(m_textMessage);
+                        clear();
+                        Q_EMIT textMessageReceived(textMessage);
+                    } else {
+                        const QByteArray binaryMessage(m_binaryMessage);
+                        clear();
+                        Q_EMIT binaryMessageReceived(binaryMessage);
+                    }
                 }
             }
         } else {