summaryrefslogtreecommitdiff
path: root/tests/auto/qml/Client.qml
diff options
context:
space:
mode:
authorBernd Lamecker <bernd.lamecker@basyskom.com>2014-08-12 16:46:59 +0200
committerMilian Wolff <milian.wolff@kdab.com>2014-12-19 11:39:52 +0100
commit3ed29bca08dec484003cf573dd428b73627ffa81 (patch)
tree8e688a00c409cbd4a37412342faa2185b7b3869d /tests/auto/qml/Client.qml
parent9fdce8e443030ab99d31e42fffc977cf284c36c4 (diff)
downloadqtwebchannel-3ed29bca08dec484003cf573dd428b73627ffa81.tar.gz
Do not broadcast signals or property changes of wrapped qobjects
Signals and property changes caused by dynamically created qobjects (qobjects returned from a method call at runtime) should not be broadcasted to any client but only sent to clients which know these qobjects. Also added testcases for the changes. Change-Id: I9aacfa9e7e9df9314b44c6ba8e7339a2069e3c37 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Diffstat (limited to 'tests/auto/qml/Client.qml')
-rw-r--r--tests/auto/qml/Client.qml9
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/auto/qml/Client.qml b/tests/auto/qml/Client.qml
index 6e12993..c18644f 100644
--- a/tests/auto/qml/Client.qml
+++ b/tests/auto/qml/Client.qml
@@ -98,7 +98,12 @@ Item {
for (var i = 0; i < 10 && !root[from].length; ++i)
wait(10);
- return root[from].shift();
+
+ var msg = root[from].shift();
+ if (debug) {
+ console.log((root.objectName ? "(" + root.objectName + ")" : ""), "Shifting Message " + from + ":" + JSON.stringify(msg));
+ }
+ return msg;
}
function awaitMessage(from)
@@ -114,7 +119,7 @@ Item {
function await(type, from, skip) {
var msg;
do {
- msg = awaitMessage();
+ msg = awaitMessage(from);
verify(msg);
} while (skip && (msg.type === JSClient.QWebChannelMessageTypes.idle));
if (type !== null) {