Merge remote-tracking branch 'origin/5.6' into 5.7

Alleged Conflicts:
	examples/webchannel/chatclient-html/doc/src/chatclient-html.qdoc
	examples/webchannel/chatclient-qml/doc/src/chatclient-qml.qdoc
	examples/webchannel/chatserver-cpp/doc/src/chatserver-cpp.qdoc

In each case, the two sides agreed byte-for-byte.
Not quite sure what git thought the conflict was !

Change-Id: I5da9695b667f4112848c520b630ab1304d61cea3

1 files changed, 9 insertions, 0 deletions

diff --git a/src/webchannel/qmetaobjectpublisher_p.h b/src/webchannel/qmetaobjectpublisher_p.h
index f5109b6..29956e0 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;
+
     /**
      * Given a QVariant containing a QObject*, wrap the object and register for property updates
      * return the objects class information.