From 1b9a3c75259ceaa5e475b47e396a548c475df401 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Wed, 29 Nov 2017 10:23:02 +0100 Subject: Fix apparently invalid auto-test (qmlwebsockets) It makes sense to first start listening (server.listen = true) and then connect (socket.active = true). Task-number: QTBUG-59388 Change-Id: I4235dad87ee3a62ebf75cec39e5d9fa4b7ed7552 Reviewed-by: Edward Welbourne --- tests/auto/qml/qmlwebsockets/tst_qmlwebsockets.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } -- cgit v1.2.1 From bd08a6ba75ed04089fb2fa3e763ade8ebc1ef9da Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 12 Dec 2017 09:55:16 +0100 Subject: Bump version Change-Id: Ide48dd1b6e21a6441473c7e408c7cf5513fd30db --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index e795316..24222fd 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.9.3 +MODULE_VERSION = 5.9.4 -- cgit v1.2.1 From fc5247f669d0aecfef861191682fba5518175e34 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Thu, 4 Jan 2018 13:56:23 +0200 Subject: Add changes file for Qt 5.9.4 Change-Id: Ic6f8ac83bd779f4ba0576c9f849f9d7afa77a412 Reviewed-by: Lars Knoll Reviewed-by: Liang Qi --- dist/changes-5.9.4 | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 dist/changes-5.9.4 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. + -- cgit v1.2.1