Add declarative object-registration API to QML WebChannel.

The new registeredObjects list property is now preferred over the old
imparative registerObject/registerObjects API.

Items that are added to the list need an attached WebChannel.id property
which holds the identifier under which the object is published to remote
clients.

Change-Id: I96a8047b9a85e27f3fd48c900180c22ebd20eb35
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 7 insertions, 9 deletions

diff --git a/examples/qtobject/main.qml b/examples/qtobject/main.qml
index 7bfe714..d8ec54b 100644
--- a/examples/qtobject/main.qml
+++ b/examples/qtobject/main.qml
@@ -49,23 +49,21 @@ import QtWebKit.experimental 1.0
 Rectangle {
     TestObjectFactory {
         id: factory
+        WebChannel.id: "testObjectFactory"
     }
     TestObject {
         id: testObject
         objectName: "initialTestObject"
+        WebChannel.id: objectName
     }
 
     WebChannel {
         id: webChannel
 
-        onInitialized: {
-            registerObjects({
-                "testObjectFactory": factory,
-                "initialTestObject": testObject
-            });
-
-            webView.url = "qrc:/index.html?webChannelBaseUrl=" + webChannel.baseUrl;
-        }
+        registeredObjects: [
+            factory,
+            testObject
+        ];
     }
 
     width: 480
@@ -73,7 +71,7 @@ Rectangle {
 
     WebView {
         id: webView
-        url: "about:blank"
+        url: webChannel.baseUrl ? ("qrc:/index.html?webChannelBaseUrl=" + webChannel.baseUrl) : "about:blank";
         anchors.fill: parent
         experimental.preferences.developerExtrasEnabled: true
     }