Change-Id: I9c9d3330bf75912b55a99f2bb88822b1cefb0f5e

Since commit 709f6370884b110def2e4665df8fa7bbf5fae734 the plugin loader
is strict about requiring the correct interface id, to avoid loading
unrelated plugins in the loader thread (which they may not be prepared
to do).

Change-Id: If86aec735525d2fd169d2d3fae451316f656f238
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

Conflicts:
	.qmake.conf
	tests/auto/webchannel/tst_webchannel.cpp
	tests/auto/webchannel/tst_webchannel.h

Change-Id: I01b0f58c10acbef8e2d5d15fc5787e755f519af8

Change-Id: If2a4f50d03fccc2654b8336d9e40daea85d6adca

Change-Id: I5508bb77d24a5c1dcacf4d0dee57c31195c0a188

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

This is again trying to reproduce the issue described in the bug report,
but it also passes for me. Still, it's good to have this tested in
more depth.

Change-Id: Ibaaefd7359d558c3b59af3d86a1260ab06caa598
Task-number: QTBUG-54074
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>

Added a QMultiHash which maps transport objects to wrapped object ids.
transportRemoved iterates over all matching wrapped objects and removes
the passed transport object from their transports-vector. If the
transports-vector is empty after removing the passed transport object
the objectDestroyed will be called on the wrapped object.
transportRemoved will be called either on the transports destoryed
signal or on disconnecting the webchannel from it.

Without this changes the QMetaObjectPublisher::wrappedObjects and
::registeredObjectIds would only be cleaned up if the website calls
deleteLater on QObjects but not on website reloads.

Task-number: QTBUG-50074
Change-Id: If294564fee2406edd7fb578852aeb269cac23a92
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
(cherry picked from commit fa2374d7

)
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>

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

This test passes and seems to indicate that the signal-delivery has
an issue, or that the issue lies on the JavaScript side.

Change-Id: Ic2436147b3af49d35dc556da57aed3e54408f1f9
Task-number: QTBUG-54074
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>

This enables you to pass `QObject*` parameters via signals to the
JavaScript side. The object will be serialized and then unwrapped
as needed now.

Task-number: QTBUG-54243
Change-Id: Ie8a6d14eb1351f14f1855d242ceb3b3f8262152d
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>

If you get an object from the server and want to pass it back to the
server via a function the id of the object is passed instead of the
whole json object. On the server side QMetaObjectPublisher::invokeMethod
now looks up the object in QMetaObjectPublisher::wrappedObjects by the
passed object-id.

Task-number: QTBUG-50075
Change-Id: Id0df2dfaa79bcba12ca48391ae7537ac1a086898
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

Change-Id: If663d043ad0da98731e436309d3b40e3379b0831

See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771



Change-Id: I84346b304041f23abe6f1b99d8681199b03e57f4
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

Change-Id: I9120c4d9c6cf08cdaaec468a514e2ab060abde35
Task-number: QTBUG-53913
Reviewed-by: Sami Makkonen <sami.makkonen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

- Add images to the examples.
- Add instructions for running the examples
- Edit for grammar and style
- Add dependencies to Qt WebEngine and Qt WebSockets modules
- Add a workaround for preventing autolinking of WebChannel,
  WebEngine and WebSockets to the wrong targets
- Use explicit linking where necessary

Change-Id: Ia4025284063fa09c9e2a0b2c347ee682bba8a615
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
(cherry picked from commit 01ea92c7)

You don't need the type name for linking within the type docs.
Also, the convention in QML and Qt Quick is to use a period and
not a double colon.

Change-Id: Ic93bae51e766ef782f089ce69dc4e54a712445c6
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>

And fix a typo "connectect".

Change-Id: I14c4b249af3cad142a5f6042b2059f653a9c3eae
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

For consistency, the first verb should be in 3rd person
singular form.

Change-Id: I5e24ecbbac1b1ab85e737f127b021f24a55c8dd4
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

-Remove references to Qt WebKit

Change-Id: I0bd184021b1a87828e93f5783c38b9ba97f37763
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

- Remove reference to Qt WebKit
- Add Getting Started section
- Use standard section titles for API Reference
  and Examples

Change-Id: Ie5e3ac792a109f680132a79e86d5e1065f4c3829
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

Added a QMultiHash which maps transport objects to wrapped object ids.
transportRemoved iterates over all matching wrapped objects and removes
the passed transport object from their transports-vector. If the
transports-vector is empty after removing the passed transport object
the objectDestroyed will be called on the wrapped object.
transportRemoved will be called either on the transports destoryed
signal or on disconnecting the webchannel from it.

Without this changes the QMetaObjectPublisher::wrappedObjects and
::registeredObjectIds would only be cleaned up if the website calls
deleteLater on QObjects but not on website reloads.

Task-number: QTBUG-50074
Change-Id: If294564fee2406edd7fb578852aeb269cac23a92
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

- Add images to the examples.
- Add instructions for running the examples
- Edit for grammar and style
- Add dependencies to Qt WebEngine and Qt WebSockets modules
- Add a workaround for preventing autolinking of WebChannel,
  WebEngine and WebSockets to the wrong targets
- Use explicit linking where necessary

Change-Id: Ia4025284063fa09c9e2a0b2c347ee682bba8a615
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>

Similar to the previous issue, where these types were not properly
converted to QVariant when invoking a method, we manually do the
conversion now to get the desired behavior. The culprit is again
that QJsonValue::toVariant converts an object e.g. to a QVariantMap,
and not to a QVariant containing a QJsonObject.

[ChangeLog] QObject properties of type QJsonValue, QJsonArray or
QJsonObject can now be set via the Qt WebChannel.

Task-number: QTBUG-48198
Change-Id: I5d574b1a5cffd6d6ad9b555f2a3e872b9c3425a7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

We used to convert the QJsonValue arguments to QVariants, which
then failed to call a C++ function which expected on of the three
QJson data types, i.e. QJsonValue, QJsonObject or QJsonArray. Instead,
we now detect these three cases and manually convert the QJsonValue
as needed.

[ChangeLog] C++ functions taking arguments of type QJsonValue,
QJsonArray or QJsonObject can now be called via the Qt WebChannel.

Change-Id: I94e0c8937ca35e2ecd3554f7ddf2d4e5a3328570
Task-number: QTBUG-48198
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

Change-Id: Ica9ff8d7142c5bd5328d44505beb8c22b4c21766

it's done centrally now.

Change-Id: I0922b2083b594cdf61f4606fe17c9c61c0d4683a
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

Conflicts:
	.qmake.conf

Change-Id: I52dc7e8ad7a9ce6fa36ad2d6ce5d8ea29b77b400

Change-Id: I73f3738a4ba90af8bc8572edecda56bec7d1f60b

This was requested by Jani, even though only minor improvements have
been made to Qt WebChannel.

Change-Id: Idf8f98bfa1450bfbc5e5442a11b11c2381894d0e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

Examples in binary packages now directly match the install path.

Change-Id: I06c85e42d312bd6a1e1ae619330676b717b6ccbd
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

Change-Id: Ic3979ec70b7ddf7d01d0873c00b7739c5f0ef3c9
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

Change-Id: Iccf9f6e0e9358ba42576fb67a0b356c7414d911e
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

Change-Id: I509dbfd09d64d8b2a3e9ff17893e99d78a9186f8
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

This was requested by Jani, even though only minor improvements have
been made to Qt WebChannel.

Change-Id: I601d6cc05711556d899b2459cba45f1b48d2aa3a
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

Change-Id: Ib651958ec7aa12eb205a11a515fa9a464e254bd0
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

Change-Id: I38ddf1dd4af4e350a11288eebdfd3c3ee1dc5fe9
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

Includes go from most specific to least specific

Change-Id: I86aa972dbb09a31142c443dd88f1930e91bf2803
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

Change-Id: I3c3a971c56a5622d24ac8f583bef2039097e244e
Reviewed-by: Sérgio Martins <iamsergio@gmail.com>
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>

Change-Id: I434c84d04d8e8d427bec4fd9f0f9ee20c54e7fc5
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>