Merge remote-tracking branch 'origin/5.7' into 5.8

Change-Id: Ia8c2930d5bf681227cef0730cdf0dca6d068722f

src/websockets/doc/src/overview.qdoc

@@ -39,7 +39,7 @@ Historically, web applications that needed bidirectional communication or
 push notifications had to use one of the HTTP-based solutions available. These
 solutions employed different techniques such as polling, long-polling, and
 streaming, to overcome the limitations of HTTP protocol, which is not designed
-for such use cases. As a result, high network latency, unnecessary data
+for such use cases. This resulted in high network latency, unnecessary data
 exchange, and stale or old data. The WebSocket offering by IETF helps to
 overcome these problems to a large extent.
 

sync.profile

@@ -4,8 +4,3 @@
 
 %moduleheaders = (
 );
-
-%dependencies = (
-    "qtbase" => "",
-    "qtdeclarative" => "",
-);

tests/global/global.cfg

+<config>
+<modules>
+<module name="QtWebSockets"   qtname="websockets"/>
+</modules>
+</config>