Make the QWebChannel QML API publically accessible.

This is required for proper QtWebKit/QtWebEngine integration, as
otherwise these modules would have to redo a lot of the QtWebChannel
QML API. Furthermore, without this, we could not use the WebChannel.id
attached property everywhere, independent of the web browser technology.

Change-Id: I032a9326841d505c2f77959a240bbfc71e94b6e8
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/src/webchannel/qwebchannel.h b/src/webchannel/qwebchannel.h
index 3e6f7a1..a4f34b4 100644
--- a/src/webchannel/qwebchannel.h
+++ b/src/webchannel/qwebchannel.h
@@ -90,20 +90,22 @@ public:
      */
     void setBlockUpdates(bool block);
 
-    void connectTo(QWebChannelAbstractTransport *transport);
-    void disconnectFrom(QWebChannelAbstractTransport *transport);
-
 Q_SIGNALS:
     void blockUpdatesChanged(bool block);
 
 public Q_SLOTS:
+    void connectTo(QWebChannelAbstractTransport *transport);
+    void disconnectFrom(QWebChannelAbstractTransport *transport);
+
     void sendMessage(const QJsonValue &id, const QJsonValue &data = QJsonValue()) const;
 
 private:
-    QScopedPointer<QWebChannelPrivate> d;
-    Q_PRIVATE_SLOT(d, void _q_transportDestroyed(QObject*));
+    Q_DECLARE_PRIVATE(QWebChannel)
+    QWebChannel(QWebChannelPrivate &dd, QObject *parent = 0);
+    Q_PRIVATE_SLOT(d_func(), void _q_transportDestroyed(QObject*));
+
     friend class QMetaObjectPublisher;
-    friend class QmlWebChannel;
+    friend class QQmlWebChannel;
     friend class TestWebChannel;
 };