From 6419556a2bebe81244198e84696aa6eeebdf463d Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Thu, 8 May 2014 18:38:22 +0200
Subject: Add missing classname for module in qmldir.

Task-number: QTBUG-38854
Change-Id: Iad6d49309010fd9ccb7e8fcb2c58962d811f018f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 src/imports/qmlwebsockets/qmldir                   | 1 +
 src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp | 2 +-
 src/imports/qmlwebsockets/qmlwebsockets_plugin.h   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/imports/qmlwebsockets/qmldir b/src/imports/qmlwebsockets/qmldir
index 4ae1035..3202976 100644
--- a/src/imports/qmlwebsockets/qmldir
+++ b/src/imports/qmlwebsockets/qmldir
@@ -1,3 +1,4 @@
 module Qt.WebSockets
 plugin declarative_qmlwebsockets
+classname QtWebSocketsDeclarativeModule
 typeinfo plugins.qmltypes
diff --git a/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp b/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp
index a36aeac..9c7f2d6 100644
--- a/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp
+++ b/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"));
 
diff --git a/src/imports/qmlwebsockets/qmlwebsockets_plugin.h b/src/imports/qmlwebsockets/qmlwebsockets_plugin.h
index 1cab587..9e64091 100644
--- a/src/imports/qmlwebsockets/qmlwebsockets_plugin.h
+++ b/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")
-- 
cgit v1.2.1


From f5482589970c9c013c6909d3d29f40562f86aa42 Mon Sep 17 00:00:00 2001
From: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Date: Tue, 20 May 2014 15:01:53 +0200
Subject: Document WebSocket::sendTextMessage(string message)

Change-Id: I38c08520c37d84570c3c8df9d2416131defc5b40
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
---
 src/imports/qmlwebsockets/qqmlwebsocket.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.cpp b/src/imports/qmlwebsockets/qqmlwebsocket.cpp
index f91b07c..d165260 100644
--- a/src/imports/qmlwebsockets/qqmlwebsocket.cpp
+++ b/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>
 
-- 
cgit v1.2.1


From eb16b1970293dfeb5918751afbdf1fb7f62028e1 Mon Sep 17 00:00:00 2001
From: Sergio Ahumada <sahumada@blackberry.com>
Date: Mon, 26 May 2014 11:36:35 +0200
Subject: Bump MODULE_VERSION to 5.3.1

Change-Id: I1eff9112ed777d873961854b3f81a00d34cb3e1f
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
---
 .qmake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.qmake.conf b/.qmake.conf
index bb45dc5..e2217eb 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -3,4 +3,4 @@ load(qt_build_config)
 CONFIG += qt_example_installs
 CONFIG += warning_clean
 
-MODULE_VERSION = 5.3.0
+MODULE_VERSION = 5.3.1
-- 
cgit v1.2.1