From e41356d8a8b3808a4d4a6df6668812a7eb012378 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@theqtcompany.com>
Date: Thu, 4 Dec 2014 10:47:16 +0100
Subject: Update plugins.qmltypes

Also adapt the .pro file so that future updates can just be triggered
by 'make qmltypes'.

Change-Id: Ide120291c89e4e37991e87663b32be03af0e3f88
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
---
 src/imports/webchannel/plugins.qmltypes | 62 ++++++++++++++++-----------------
 src/imports/webchannel/webchannel.pro   |  2 ++
 2 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'src/imports/webchannel')

diff --git a/src/imports/webchannel/plugins.qmltypes b/src/imports/webchannel/plugins.qmltypes
index 789f2b4..4d0155d 100644
--- a/src/imports/webchannel/plugins.qmltypes
+++ b/src/imports/webchannel/plugins.qmltypes
@@ -4,49 +4,21 @@ import QtQuick.tooling 1.1
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -notrelocatable QtWebChannel 1.0'
+// 'qmlplugindump -nonrelocatable QtWebChannel 1.0'
 
 Module {
     Component {
-        name: "QWebChannel"
-        prototype: "QObject"
-        Property { name: "blockUpdates"; type: "bool" }
-        Signal {
-            name: "blockUpdatesChanged"
-            Parameter { name: "block"; type: "bool" }
-        }
-        Method {
-            name: "sendMessage"
-            Parameter { name: "id"; type: "QJsonValue" }
-            Parameter { name: "data"; type: "QJsonValue" }
-        }
-        Method {
-            name: "sendMessage"
-            Parameter { name: "id"; type: "QJsonValue" }
-        }
-        Method {
-            name: "registerObject"
-            Parameter { name: "id"; type: "string" }
-            Parameter { name: "object"; type: "QObject"; isPointer: true }
-        }
-        Method {
-            name: "deregisterObject"
-            Parameter { name: "object"; type: "QObject"; isPointer: true }
-        }
-    }
-    Component {
-        name: "QmlWebChannel"
+        name: "QQmlWebChannel"
         prototype: "QWebChannel"
         exports: ["QtWebChannel/WebChannel 1.0"]
         exportMetaObjectRevisions: [0]
-        attachedType: "QmlWebChannelAttached"
+        attachedType: "QQmlWebChannelAttached"
         Property { name: "transports"; type: "QObject"; isList: true; isReadonly: true }
         Property { name: "registeredObjects"; type: "QObject"; isList: true; isReadonly: true }
         Method {
             name: "registerObjects"
             Parameter { name: "objects"; type: "QVariantMap" }
         }
-        Method { name: "test_clientIsIdle"; type: "bool" }
         Method {
             name: "connectTo"
             Parameter { name: "transport"; type: "QObject"; isPointer: true }
@@ -57,7 +29,7 @@ Module {
         }
     }
     Component {
-        name: "QmlWebChannelAttached"
+        name: "QQmlWebChannelAttached"
         prototype: "QObject"
         Property { name: "id"; type: "string" }
         Signal {
@@ -65,4 +37,30 @@ Module {
             Parameter { name: "id"; type: "string" }
         }
     }
+    Component {
+        name: "QWebChannel"
+        prototype: "QObject"
+        Property { name: "blockUpdates"; type: "bool" }
+        Signal {
+            name: "blockUpdatesChanged"
+            Parameter { name: "block"; type: "bool" }
+        }
+        Method {
+            name: "connectTo"
+            Parameter { name: "transport"; type: "QWebChannelAbstractTransport"; isPointer: true }
+        }
+        Method {
+            name: "disconnectFrom"
+            Parameter { name: "transport"; type: "QWebChannelAbstractTransport"; isPointer: true }
+        }
+        Method {
+            name: "registerObject"
+            Parameter { name: "id"; type: "string" }
+            Parameter { name: "object"; type: "QObject"; isPointer: true }
+        }
+        Method {
+            name: "deregisterObject"
+            Parameter { name: "object"; type: "QObject"; isPointer: true }
+        }
+    }
 }
diff --git a/src/imports/webchannel/webchannel.pro b/src/imports/webchannel/webchannel.pro
index 8ae6ef5..4c8d322 100644
--- a/src/imports/webchannel/webchannel.pro
+++ b/src/imports/webchannel/webchannel.pro
@@ -3,6 +3,8 @@ QT = core quick webchannel-private
 INCLUDEPATH += ../../webchannel
 VPATH += ../../webchannel
 
+IMPORT_VERSION = 1.0
+
 SOURCES += \
     plugin.cpp
 
-- 
cgit v1.2.1