diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-30 03:02:13 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-30 03:02:13 +0100 |
| commit | ead6315cc9624322ed5bca8e34cf426d0fa9159b (patch) | |
| tree | edbf35ec5ab05f9731750092f285e0de5352d906 | |
| parent | d91fd4fc4e57a22e1d268e4602017f629cfccf46 (diff) | |
| parent | 6e3fb84e6caa8c9bd4952bd647466469c5faf526 (diff) | |
| download | qtwebchannel-ead6315cc9624322ed5bca8e34cf426d0fa9159b.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ida698daaae6d184137358ee49fa2d27b6654d8b3
| -rw-r--r-- | src/imports/webchannel/dependencies.json | 2 | ||||
| -rw-r--r-- | src/imports/webchannel/plugins.qmltypes | 5 | ||||
| -rw-r--r-- | src/webchannel/qqmlwebchannel.cpp | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/imports/webchannel/dependencies.json b/src/imports/webchannel/dependencies.json new file mode 100644 index 0000000..0d4f101 --- /dev/null +++ b/src/imports/webchannel/dependencies.json @@ -0,0 +1,2 @@ +[ +] diff --git a/src/imports/webchannel/plugins.qmltypes b/src/imports/webchannel/plugins.qmltypes index 4d0155d..c138386 100644 --- a/src/imports/webchannel/plugins.qmltypes +++ b/src/imports/webchannel/plugins.qmltypes @@ -1,12 +1,13 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtWebChannel 1.0' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtWebChannel 1.0' Module { + dependencies: [] Component { name: "QQmlWebChannel" prototype: "QWebChannel" diff --git a/src/webchannel/qqmlwebchannel.cpp b/src/webchannel/qqmlwebchannel.cpp index d23ebef..20f6e73 100644 --- a/src/webchannel/qqmlwebchannel.cpp +++ b/src/webchannel/qqmlwebchannel.cpp @@ -134,8 +134,8 @@ QQmlWebChannel::~QQmlWebChannel() /*! \qmlmethod void WebChannel::registerObjects(QVariantMap objects) - Registers objects to make them accessible to HTML clients. The key of the - map is used as an identifier for the object on the client side. + Registers the specified \a objects to make them accessible to HTML clients. + The key of the map is used as an identifier for the object on the client side. Once registered, all signals and property changes are automatically propagated to the clients. Public invokable methods, including slots, are also accessible to the clients. |