From 395c1f1aed90f740f079d8f980c93f459b44733a Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Fri, 16 Nov 2018 09:22:25 +0200 Subject: Add changes file for Qt 5.11.3 + bac5a37663249edb9a9746687a7128c013af0309 Bump version Change-Id: I40deedc5fe639c54017861bae3486539bcc9f347 Reviewed-by: Jani Heikkinen --- dist/changes-5.11.3 | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 dist/changes-5.11.3 diff --git a/dist/changes-5.11.3 b/dist/changes-5.11.3 new file mode 100644 index 0000000..f71fa34 --- /dev/null +++ b/dist/changes-5.11.3 @@ -0,0 +1,20 @@ +Qt 5.11.3 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.11.0 through 5.11.2. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.11 series is binary compatible with the 5.10.x series. +Applications compiled for 5.10 will continue to run with 5.11. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - This release contains only minor code improvements. -- cgit v1.2.1 From 16bfc98a03186cef5aafa79709b086faa0d4f9f2 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Wed, 19 Dec 2018 12:01:44 +1000 Subject: wasm: set and update socket state MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: QTBUG-72664 Change-Id: I8bd90f8676835d8f7bec135ad3e6c6b3e9cd9d9a Reviewed-by: Mårten Nordheim Reviewed-by: Morten Johan Sørvig --- src/websockets/qwebsocket_p.h | 2 +- src/websockets/qwebsocket_wasm_p.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h index fd631d4..4b39dfc 100644 --- a/src/websockets/qwebsocket_p.h +++ b/src/websockets/qwebsocket_p.h @@ -158,6 +158,7 @@ public: void close(QWebSocketProtocol::CloseCode closeCode, QString reason); void open(const QNetworkRequest &request, bool mask); void ping(const QByteArray &payload); + void setSocketState(QAbstractSocket::SocketState state); private: QWebSocketPrivate(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version); @@ -168,7 +169,6 @@ private: void setProtocol(const QString &protocol); void setExtension(const QString &extension); void enableMasking(bool enable); - void setSocketState(QAbstractSocket::SocketState state); void setErrorString(const QString &errorString); void socketDestroyed(QObject *socket); diff --git a/src/websockets/qwebsocket_wasm_p.cpp b/src/websockets/qwebsocket_wasm_p.cpp index 2ac61ba..922d6a8 100644 --- a/src/websockets/qwebsocket_wasm_p.cpp +++ b/src/websockets/qwebsocket_wasm_p.cpp @@ -63,6 +63,7 @@ static void q_onCloseCallback(val event) QWebSocketPrivate *wsp = reinterpret_cast(target["data-context"].as()); Q_ASSERT (wsp); + wsp->setSocketState(QAbstractSocket::UnconnectedState); emit wsp->q_func()->disconnected(); } @@ -73,6 +74,7 @@ static void q_onOpenCallback(val event) QWebSocketPrivate *wsp = reinterpret_cast(target["data-context"].as()); Q_ASSERT (wsp); + wsp->setSocketState(QAbstractSocket::ConnectedState); emit wsp->q_func()->connected(); } @@ -149,6 +151,7 @@ void QWebSocketPrivate::close(QWebSocketProtocol::CloseCode closeCode, QString r m_closeCode = closeCode; m_closeReason = reason; Q_EMIT q->aboutToClose(); + setSocketState(QAbstractSocket::ClosingState); socketContext.call("close", static_cast(closeCode), reason.toLatin1().toStdString()); @@ -165,6 +168,7 @@ void QWebSocketPrivate::open(const QNetworkRequest &request, bool mask) return; } + setSocketState(QAbstractSocket::ConnectingState); const std::string urlbytes = url.toString().toStdString(); // HTML WebSockets do not support arbitrary request headers, but -- cgit v1.2.1 From e567b9d8c8447f8d2bd35ab3184b956e95380222 Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Mon, 7 Jan 2019 09:30:23 +0200 Subject: Bump version Change-Id: I11f9366390daf44b79ce8d812a2fb1146b219dc9 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index bc074d5..b9d358f 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.12.0 +MODULE_VERSION = 5.12.1 -- cgit v1.2.1