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/imports/webchannel/plugin.cpp | |
| 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/imports/webchannel/plugin.cpp')
| -rw-r--r-- | src/imports/webchannel/plugin.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/webchannel/plugin.cpp b/src/imports/webchannel/plugin.cpp index 6507112..235f542 100644 --- a/src/imports/webchannel/plugin.cpp +++ b/src/imports/webchannel/plugin.cpp @@ -42,7 +42,8 @@ #include <qqml.h> #include <QtQml/QQmlExtensionPlugin> -#include "qmlwebchannel.h" +#include <qqmlwebchannel.h> +#include <qqmlwebchannelattached_p.h> QT_BEGIN_NAMESPACE @@ -59,7 +60,7 @@ void QWebChannelPlugin::registerTypes(const char *uri) { int major = 1; int minor = 0; - qmlRegisterType<QmlWebChannel>(uri, major, minor, "WebChannel"); + qmlRegisterType<QQmlWebChannel>(uri, major, minor, "WebChannel"); } QT_END_NAMESPACE |