summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-05-25 15:19:26 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-05-26 12:07:34 +0000
commit79e84ac39d17264d24c732a4e9693f4b5b57b3ac (patch)
tree14c3bcaa668c1ba75f3df3c4d0fbe9a45674442c /src
parent083f25b2989f5736a7531d9a49d839a79784906a (diff)
downloadqtwebsockets-79e84ac39d17264d24c732a4e9693f4b5b57b3ac.tar.gz
Update plugins.qmltypes for QtWebSockets and Qt.WebSockets
Change-Id: I7cacbce1625015636e92b2fd5f2ade694a97a5c9 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/imports/qmlwebsockets/plugins.qmltypes5
-rw-r--r--src/imports/qmlwebsockets_compat/plugins.qmltypes97
-rw-r--r--src/imports/qmlwebsockets_compat/qmldir2
3 files changed, 101 insertions, 3 deletions
diff --git a/src/imports/qmlwebsockets/plugins.qmltypes b/src/imports/qmlwebsockets/plugins.qmltypes
index 5b8d1f9..5df4b5c 100644
--- a/src/imports/qmlwebsockets/plugins.qmltypes
+++ b/src/imports/qmlwebsockets/plugins.qmltypes
@@ -1,4 +1,4 @@
-import QtQuick.tooling 1.1
+import QtQuick.tooling 1.2
// This file describes the plugin-supplied types contained in the library.
// It is used for QML tooling purposes only.
@@ -7,6 +7,7 @@ import QtQuick.tooling 1.1
// 'qmlplugindump -notrelocatable QtWebSockets 1.0'
Module {
+ dependencies: []
Component {
name: "QQmlWebSocket"
prototype: "QObject"
@@ -51,7 +52,7 @@ Module {
Component {
name: "QQmlWebSocketServer"
prototype: "QObject"
- exports: ["Qt.WebSockets/WebSocketServer 1.0"]
+ exports: ["QtWebSockets/WebSocketServer 1.0"]
exportMetaObjectRevisions: [0]
Property { name: "url"; type: "QUrl"; isReadonly: true }
Property { name: "host"; type: "string" }
diff --git a/src/imports/qmlwebsockets_compat/plugins.qmltypes b/src/imports/qmlwebsockets_compat/plugins.qmltypes
new file mode 100644
index 0000000..ff8d976
--- /dev/null
+++ b/src/imports/qmlwebsockets_compat/plugins.qmltypes
@@ -0,0 +1,97 @@
+import QtQuick.tooling 1.2
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -notrelocatable Qt.WebSockets 1.0'
+
+Module {
+ dependencies: []
+ Component {
+ name: "QQmlWebSocket"
+ prototype: "QObject"
+ exports: ["Qt.WebSockets/WebSocket 1.0"]
+ exportMetaObjectRevisions: [0]
+ Enum {
+ name: "Status"
+ values: {
+ "Connecting": 0,
+ "Open": 1,
+ "Closing": 2,
+ "Closed": 3,
+ "Error": 4
+ }
+ }
+ Property { name: "url"; type: "QUrl" }
+ Property { name: "status"; type: "Status"; isReadonly: true }
+ Property { name: "errorString"; type: "string"; isReadonly: true }
+ Property { name: "active"; type: "bool" }
+ Signal {
+ name: "textMessageReceived"
+ Parameter { name: "message"; type: "string" }
+ }
+ Signal {
+ name: "statusChanged"
+ Parameter { name: "status"; type: "Status" }
+ }
+ Signal {
+ name: "activeChanged"
+ Parameter { name: "isActive"; type: "bool" }
+ }
+ Signal {
+ name: "errorStringChanged"
+ Parameter { name: "errorString"; type: "string" }
+ }
+ Method {
+ name: "sendTextMessage"
+ type: "qlonglong"
+ Parameter { name: "message"; type: "string" }
+ }
+ }
+ Component {
+ name: "QQmlWebSocketServer"
+ prototype: "QObject"
+ exports: ["Qt.WebSockets/WebSocketServer 1.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "url"; type: "QUrl"; isReadonly: true }
+ Property { name: "host"; type: "string" }
+ Property { name: "port"; type: "ushort" }
+ Property { name: "name"; type: "string" }
+ Property { name: "errorString"; type: "string"; isReadonly: true }
+ Property { name: "listen"; type: "bool" }
+ Property { name: "accept"; type: "bool" }
+ Signal {
+ name: "clientConnected"
+ Parameter { name: "webSocket"; type: "QQmlWebSocket"; isPointer: true }
+ }
+ Signal {
+ name: "errorStringChanged"
+ Parameter { name: "errorString"; type: "string" }
+ }
+ Signal {
+ name: "urlChanged"
+ Parameter { name: "url"; type: "QUrl" }
+ }
+ Signal {
+ name: "portChanged"
+ Parameter { name: "port"; type: "ushort" }
+ }
+ Signal {
+ name: "nameChanged"
+ Parameter { name: "name"; type: "string" }
+ }
+ Signal {
+ name: "hostChanged"
+ Parameter { name: "host"; type: "string" }
+ }
+ Signal {
+ name: "listenChanged"
+ Parameter { name: "listen"; type: "bool" }
+ }
+ Signal {
+ name: "acceptChanged"
+ Parameter { name: "accept"; type: "bool" }
+ }
+ }
+}
diff --git a/src/imports/qmlwebsockets_compat/qmldir b/src/imports/qmlwebsockets_compat/qmldir
index eca44f0..a4310d9 100644
--- a/src/imports/qmlwebsockets_compat/qmldir
+++ b/src/imports/qmlwebsockets_compat/qmldir
@@ -1,4 +1,4 @@
module Qt.WebSockets
plugin declarative_qmlwebsockets ../../QtWebSockets/
classname QtWebSocketsDeclarativeModule
-typeinfo ../../QtWebSockets/plugins.qmltypes
+typeinfo plugins.qmltypes