Merge remote-tracking branch 'origin/5.3' into dev

Conflicts:
	.qmake.conf

Change-Id: I8ef1da19810c1bf4d68bf157848bccb5446669cc

src/imports/qmlwebsockets/qmldir

 module Qt.WebSockets
 plugin declarative_qmlwebsockets
+classname QtWebSocketsDeclarativeModule
 typeinfo plugins.qmltypes

src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp

@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-void QmlWebSocket_plugin::registerTypes(const char *uri)
+void QtWebSocketsDeclarativeModule::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("Qt.WebSockets"));
 

src/imports/qmlwebsockets/qmlwebsockets_plugin.h

@@ -48,7 +48,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QmlWebSocket_plugin : public QQmlExtensionPlugin
+class QtWebSocketsDeclarativeModule : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

src/imports/qmlwebsockets/qqmlwebsocket.cpp

@@ -99,6 +99,11 @@
   \sa WebSocket::status
   */
 
+/*!
+  \qmlmethod void WebSocket::sendTextMessage(string message)
+  Sends \c message to the server.
+  */
+
 #include "qqmlwebsocket.h"
 #include <QtWebSockets/QWebSocket>