From fa2374d7c4dedea907e2df26fdad28bdee73b122 Mon Sep 17 00:00:00 2001
From: Kai Dohmen <psykai1993@googlemail.com>
Date: Thu, 28 Apr 2016 22:08:55 +0200
Subject: Remove deleted transport objects

Added a QMultiHash which maps transport objects to wrapped object ids.
transportRemoved iterates over all matching wrapped objects and removes
the passed transport object from their transports-vector. If the
transports-vector is empty after removing the passed transport object
the objectDestroyed will be called on the wrapped object.
transportRemoved will be called either on the transports destoryed
signal or on disconnecting the webchannel from it.

Without this changes the QMetaObjectPublisher::wrappedObjects and
::registeredObjectIds would only be cleaned up if the website calls
deleteLater on QObjects but not on website reloads.

Task-number: QTBUG-50074
Change-Id: If294564fee2406edd7fb578852aeb269cac23a92
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
---
 tests/auto/webchannel/tst_webchannel.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'tests/auto/webchannel/tst_webchannel.h')

diff --git a/tests/auto/webchannel/tst_webchannel.h b/tests/auto/webchannel/tst_webchannel.h
index 98733dc..0d2fe55 100644
--- a/tests/auto/webchannel/tst_webchannel.h
+++ b/tests/auto/webchannel/tst_webchannel.h
@@ -232,12 +232,14 @@ private slots:
     void testInvokeMethodConversion();
     void testDisconnect();
     void testWrapRegisteredObject();
+    void testRemoveUnusedTransports();
     void testInfiniteRecursion();
 
     void benchClassInfo();
     void benchInitializeClients();
     void benchPropertyUpdates();
     void benchRegisterObjects();
+    void benchRemoveTransport();
 
     void qtbug46548_overriddenProperties();
 
-- 
cgit v1.2.1