diff options
author | Milian Wolff <milian.wolff@kdab.com> | 2014-07-16 13:51:07 +0200 |
---|---|---|
committer | Milian Wolff <milian.wolff@kdab.com> | 2014-07-18 13:01:13 +0200 |
commit | ffad3845615cf4c7a8343d47d55c88e10c4db405 (patch) | |
tree | 6fa2653a91ed68dbeb1a0a4a301c5bbc4a6fe22e /tests/auto/qml/Client.qml | |
parent | 324679e554561828ae1ddd0604913d12b3e150d4 (diff) | |
download | qtwebchannel-ffad3845615cf4c7a8343d47d55c88e10c4db405.tar.gz |
Explicitly distinguish between JavaScript Client and QML Client.
It worked before, but this patch makes the code more explicit.
Change-Id: Id7cf90cb3e2488106e08077e9a8165112734dd88
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Diffstat (limited to 'tests/auto/qml/Client.qml')
-rw-r--r-- | tests/auto/qml/Client.qml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qml/Client.qml b/tests/auto/qml/Client.qml index 3a60235..9904fe8 100644 --- a/tests/auto/qml/Client.qml +++ b/tests/auto/qml/Client.qml @@ -44,7 +44,7 @@ import QtTest 1.0 import QtWebChannel 1.0 import QtWebChannel.Tests 1.0 -import "qrc:///qtwebchannel/qwebchannel.js" as Client +import "qrc:///qtwebchannel/qwebchannel.js" as JSClient Item { TestTransport { @@ -108,7 +108,7 @@ Item { function createChannel(callback, raw) { - return new Client.QWebChannel(clientTransport, callback, raw); + return new JSClient.QWebChannel(clientTransport, callback, raw); } function cleanup() @@ -140,7 +140,7 @@ Item { verify(msg); verify(msg.data); verify(msg.data.type); - compare(msg.data.type, Client.QWebChannelMessageTypes.init); + compare(msg.data.type, JSClient.QWebChannelMessageTypes.init); } function awaitIdle() @@ -148,7 +148,7 @@ Item { var msg = awaitMessage(); verify(msg); verify(msg.data); - compare(msg.data.type, Client.QWebChannelMessageTypes.idle); + compare(msg.data.type, JSClient.QWebChannelMessageTypes.idle); verify(webChannel.clientIsIdle()) } @@ -159,7 +159,7 @@ Item { msg = awaitMessage(); verify(msg); verify(msg.data); - } while (msg.data.type === Client.QWebChannelMessageTypes.idle); + } while (msg.data.type === JSClient.QWebChannelMessageTypes.idle); return msg; } |