summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2014-06-14 21:51:30 +0200
committerSergio Ahumada <sahumada@blackberry.com>2014-06-14 21:51:30 +0200
commit717ba7e69a1c16f8d4b26984a63b3c0450b131bf (patch)
tree362a8a765e256edeacf47b4b172ee5aed7b7c27c /src
parent0c35647c33a51a2b9ce8319cd18283845aef40a1 (diff)
parenteb16b1970293dfeb5918751afbdf1fb7f62028e1 (diff)
downloadqtwebsockets-717ba7e69a1c16f8d4b26984a63b3c0450b131bf.tar.gz
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts: .qmake.conf Change-Id: I8ef1da19810c1bf4d68bf157848bccb5446669cc
Diffstat (limited to 'src')
-rw-r--r--src/imports/qmlwebsockets/qmldir1
-rw-r--r--src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp2
-rw-r--r--src/imports/qmlwebsockets/qmlwebsockets_plugin.h2
-rw-r--r--src/imports/qmlwebsockets/qqmlwebsocket.cpp5
4 files changed, 8 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")
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>