diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-20 16:27:47 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2016-07-21 16:44:49 +0200 |
| commit | 91ebebdbf26907c126dcc367832ed524d64b94cf (patch) | |
| tree | d9d4fee39a1fa88a2eb8ff90bcde6ec248550311 /src/webchannel/qmetaobjectpublisher_p.h | |
| parent | fa2374d7c4dedea907e2df26fdad28bdee73b122 (diff) | |
| parent | 3836fd7d12777fc53836a72d6542d2fbf2f20ac9 (diff) | |
| download | qtwebchannel-91ebebdbf26907c126dcc367832ed524d64b94cf.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/webchannel/doc/src/index.qdoc
src/webchannel/qwebchannelabstracttransport.cpp
Overlapping changes to documentation; constructed hybrid.
src/webchannel/qmetaobjectpublisher.cpp
tests/auto/webchannel/tst_webchannel.cpp
tests/auto/webchannel/tst_webchannel.h
Both sides made additions; in the same place.
Change-Id: Iff12970978b70946dc3e1290841aca2d35c9c1d0
Diffstat (limited to 'src/webchannel/qmetaobjectpublisher_p.h')
| -rw-r--r-- | src/webchannel/qmetaobjectpublisher_p.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/webchannel/qmetaobjectpublisher_p.h b/src/webchannel/qmetaobjectpublisher_p.h index fe75656..830e510 100644 --- a/src/webchannel/qmetaobjectpublisher_p.h +++ b/src/webchannel/qmetaobjectpublisher_p.h @@ -156,6 +156,11 @@ public: QVariant invokeMethod(QObject *const object, const int methodIndex, const QJsonArray &args); /** + * Set the value of property @p propertyIndex on @p object to @p value. + */ + void setProperty(QObject *object, const int propertyIndex, const QJsonValue &value); + + /** * Callback of the signalHandler which forwards the signal invocation to the webchannel clients. */ void signalEmitted(const QObject *object, const int signalIndex, const QVariantList &arguments); @@ -167,6 +172,10 @@ public: */ void objectDestroyed(const QObject *object); + QObject *unwrapObject(const QString &objectId) const; + + QVariant toVariant(const QJsonValue &value, int targetType) const; + /** * Remove wrapped objects which last transport relation is with the passed transport object. */ |