diff options
| author | Milian Wolff <milian.wolff@kdab.com> | 2014-07-03 19:17:02 +0200 |
|---|---|---|
| committer | Milian Wolff <milian.wolff@kdab.com> | 2014-07-15 11:31:48 +0200 |
| commit | 003596fad52690127afca0d7025b62bad7fd013e (patch) | |
| tree | 7b68f95ce3a519018b309990f85bf7e044307fe9 /src/webchannel/qmetaobjectpublisher_p.h | |
| parent | 125c5f7dc270ab58e5f876cf8bc8aaf56d9e8f1b (diff) | |
| download | qtwebchannel-003596fad52690127afca0d7025b62bad7fd013e.tar.gz | |
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>
Diffstat (limited to 'src/webchannel/qmetaobjectpublisher_p.h')
| -rw-r--r-- | src/webchannel/qmetaobjectpublisher_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webchannel/qmetaobjectpublisher_p.h b/src/webchannel/qmetaobjectpublisher_p.h index dda18ae..4da0c26 100644 --- a/src/webchannel/qmetaobjectpublisher_p.h +++ b/src/webchannel/qmetaobjectpublisher_p.h @@ -172,7 +172,7 @@ protected: void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; private: - friend class QmlWebChannel; + friend class QQmlWebChannelPrivate; friend class QWebChannel; friend class TestWebChannel; |