From 79e84ac39d17264d24c732a4e9693f4b5b57b3ac Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@theqtcompany.com>
Date: Mon, 25 May 2015 15:19:26 +0200
Subject: 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>
---
 src/imports/qmlwebsockets/plugins.qmltypes        |  5 +-
 src/imports/qmlwebsockets_compat/plugins.qmltypes | 97 +++++++++++++++++++++++
 src/imports/qmlwebsockets_compat/qmldir           |  2 +-
 3 files changed, 101 insertions(+), 3 deletions(-)
 create mode 100644 src/imports/qmlwebsockets_compat/plugins.qmltypes

(limited to 'src')

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
-- 
cgit v1.2.1