Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	.qmake.conf

Change-Id: I4a88ddf6722f4b29512fbec71f3d055591e625ba

dist/changes-5.9.4

+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.
+

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);
         }