diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 11:25:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-03 04:23:45 +0200 |
| commit | a5d51e11b76d8f6a6276f7e89bf0ccbc2985d474 (patch) | |
| tree | cbb473923af7db204045f6cea3882e152d3f2e8c /tests/auto/webchannel/tst_webchannel.h | |
| parent | 91ebebdbf26907c126dcc367832ed524d64b94cf (diff) | |
| parent | d342edcc22d3c9c0299e86805d93e7031507345b (diff) | |
| download | qtwebchannel-a5d51e11b76d8f6a6276f7e89bf0ccbc2985d474.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
tests/auto/webchannel/tst_webchannel.cpp
tests/auto/webchannel/tst_webchannel.h
Change-Id: I01b0f58c10acbef8e2d5d15fc5787e755f519af8
Diffstat (limited to 'tests/auto/webchannel/tst_webchannel.h')
| -rw-r--r-- | tests/auto/webchannel/tst_webchannel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/webchannel/tst_webchannel.h b/tests/auto/webchannel/tst_webchannel.h index a587499..11786b4 100644 --- a/tests/auto/webchannel/tst_webchannel.h +++ b/tests/auto/webchannel/tst_webchannel.h @@ -278,8 +278,8 @@ private slots: void testSetPropertyConversion(); void testDisconnect(); void testWrapRegisteredObject(); - void testPassWrappedObjectBack(); void testRemoveUnusedTransports(); + void testPassWrappedObjectBack(); void testInfiniteRecursion(); void benchClassInfo(); |