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

1 files changed, 22 insertions, 22 deletions

diff --git a/tests/auto/webchannel/tst_webchannel.cpp b/tests/auto/webchannel/tst_webchannel.cpp
index 0fe742f..a2c62cf 100644
--- a/tests/auto/webchannel/tst_webchannel.cpp
+++ b/tests/auto/webchannel/tst_webchannel.cpp
@@ -629,6 +629,28 @@ void TestWebChannel::testWrapRegisteredObject()
     QCOMPARE(obj.objectName(), returnedId);
 }
 
+void TestWebChannel::testRemoveUnusedTransports()
+{
+    QWebChannel channel;
+    DummyTransport *dummyTransport = new DummyTransport(this);
+    TestObject obj;
+
+    channel.connectTo(dummyTransport);
+    channel.d_func()->publisher->initializeClient(dummyTransport);
+
+    QMetaObjectPublisher *pub = channel.d_func()->publisher;
+    pub->wrapResult(QVariant::fromValue(&obj), dummyTransport);
+
+    QCOMPARE(pub->wrappedObjects.size(), 1);
+    QCOMPARE(pub->registeredObjectIds.size(), 1);
+
+    channel.disconnectFrom(dummyTransport);
+    delete dummyTransport;
+
+    QCOMPARE(pub->wrappedObjects.size(), 0);
+    QCOMPARE(pub->registeredObjectIds.size(), 0);
+}
+
 void TestWebChannel::testPassWrappedObjectBack()
 {
     QWebChannel channel;
@@ -659,28 +681,6 @@ void TestWebChannel::testPassWrappedObjectBack()
     QCOMPARE(registeredObj.mReturnedObject, &returnedObjProperty);
 }
 
-void TestWebChannel::testRemoveUnusedTransports()
-{
-    QWebChannel channel;
-    DummyTransport *dummyTransport = new DummyTransport(this);
-    TestObject obj;
-
-    channel.connectTo(dummyTransport);
-    channel.d_func()->publisher->initializeClient(dummyTransport);
-
-    QMetaObjectPublisher *pub = channel.d_func()->publisher;
-    pub->wrapResult(QVariant::fromValue(&obj), dummyTransport);
-
-    QCOMPARE(pub->wrappedObjects.size(), 1);
-    QCOMPARE(pub->registeredObjectIds.size(), 1);
-
-    channel.disconnectFrom(dummyTransport);
-    delete dummyTransport;
-
-    QCOMPARE(pub->wrappedObjects.size(), 0);
-    QCOMPARE(pub->registeredObjectIds.size(), 0);
-}
-
 void TestWebChannel::testInfiniteRecursion()
 {
     QWebChannel channel;