From d14e55f660d0b5e36e7d83b830c6422328a485d8 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Tue, 19 Feb 2019 16:12:50 +1000 Subject: wasm: fix validity state MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes:QTBUG-73689 Change-Id: I5993eb38a8fc45a06a8ced46f71034e4b87ec67b Reviewed-by: Morten Johan Sørvig --- src/websockets/qwebsocket_p.cpp | 2 ++ src/websockets/qwebsocket_wasm_p.cpp | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index c8bee53..6965731 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -1451,6 +1451,7 @@ void QWebSocketPrivate::setReadBufferSize(qint64 size) m_pSocket->setReadBufferSize(m_readBufferSize); } +#ifndef Q_OS_WASM /*! \internal */ @@ -1459,5 +1460,6 @@ bool QWebSocketPrivate::isValid() const return (m_pSocket && m_pSocket->isValid() && (m_socketState == QAbstractSocket::ConnectedState)); } +#endif QT_END_NAMESPACE diff --git a/src/websockets/qwebsocket_wasm_p.cpp b/src/websockets/qwebsocket_wasm_p.cpp index 922d6a8..199fe44 100644 --- a/src/websockets/qwebsocket_wasm_p.cpp +++ b/src/websockets/qwebsocket_wasm_p.cpp @@ -187,3 +187,9 @@ void QWebSocketPrivate::open(const QNetworkRequest &request, bool mask) socketContext.set("onmessage", val::module_property("QWebSocketPrivate_onIncomingMessageCallback")); socketContext.set("data-context", val(quintptr(reinterpret_cast(this)))); } + +bool QWebSocketPrivate::isValid() const +{ + return (!socketContext.isUndefined() && + (m_socketState == QAbstractSocket::ConnectedState)); +} -- cgit v1.2.3