summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-18 17:04:24 (GMT)
committerLiang Qi <liang.qi@qt.io>2018-01-18 17:10:56 (GMT)
commitf8665a7cf5e18e5e40ad3e50039ba0362c5d2ec7 (patch)
tree4be67e7c5b79800521d98a2cd527ffa337a6b56b
parentf5ea17db7f103bb28f210d96c5b82b4315799930 (diff)
parent78607d656e18717e2edb5e0430e7eeefaf24fa8b (diff)
downloadqtwebsockets-f8665a7cf5e18e5e40ad3e50039ba0362c5d2ec7.tar.gz
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Conflicts: .qmake.conf Change-Id: I4a88ddf6722f4b29512fbec71f3d055591e625ba
-rw-r--r--dist/changes-5.9.425
-rw-r--r--tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.qml2
2 files changed, 26 insertions, 1 deletions
diff --git a/dist/changes-5.9.4 b/dist/changes-5.9.4
new file mode 100644
index 0000000..1014937
--- /dev/null
+++ b/dist/changes-5.9.4
@@ -0,0 +1,25 @@
+Qt 5.9.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.0.
+
+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.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+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.
+
+****************************************************************************
+* Qt 5.9.4 Changes *
+****************************************************************************
+
+ - This release does not contain any changes to this module.
+
diff --git a/tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.qml b/tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.qml
index d0f19f6..66c1ed0 100644
--- a/tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.qml
+++ b/tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.qml
@@ -52,8 +52,8 @@ Rectangle {
TestCase {
function ensureConnected() {
- socket.active = true;
server.listen = true;
+ socket.active = true;
tryCompare(socket, 'status', WebSocket.Open);
verify(server.currentSocket);
}