diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:04:14 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 11:04:21 +0200 |
commit | d342edcc22d3c9c0299e86805d93e7031507345b (patch) | |
tree | 29893a91dd70c3009e8f4343f9e4d447cf4dfb77 /tests/auto/webchannel/tst_webchannel.h | |
parent | 58c800edb56d976d95cb2097e27cd39cfc02bf50 (diff) | |
parent | 3b28a6956cb3cab087481312dc82a907b118e0de (diff) | |
download | qtwebchannel-d342edcc22d3c9c0299e86805d93e7031507345b.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If2a4f50d03fccc2654b8336d9e40daea85d6adca
Diffstat (limited to 'tests/auto/webchannel/tst_webchannel.h')
-rw-r--r-- | tests/auto/webchannel/tst_webchannel.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/webchannel/tst_webchannel.h b/tests/auto/webchannel/tst_webchannel.h index b46f21b..11786b4 100644 --- a/tests/auto/webchannel/tst_webchannel.h +++ b/tests/auto/webchannel/tst_webchannel.h @@ -278,6 +278,7 @@ private slots: void testSetPropertyConversion(); void testDisconnect(); void testWrapRegisteredObject(); + void testRemoveUnusedTransports(); void testPassWrappedObjectBack(); void testInfiniteRecursion(); @@ -285,6 +286,7 @@ private slots: void benchInitializeClients(); void benchPropertyUpdates(); void benchRegisterObjects(); + void benchRemoveTransport(); void qtbug46548_overriddenProperties(); |