diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-12 11:17:22 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-05-12 11:17:23 +0200 |
| commit | adf85c09b46eaf55dab362e17e3b0828fb509750 (patch) | |
| tree | c079b2125611711a3dcd946894ad587af33e14d0 /src/dbus/qdbusconnection_p.h | |
| parent | 5dc421ec87eca15a72c82203319a9be7655cd56a (diff) | |
| parent | 6bcd27b957a5ffcfe7665b0979679510e3b2ae3d (diff) | |
Merge 5.6 into 5.6.1
Change-Id: I22003b840f1a7ac685a1ec3353d7e7dbd84c3953
Diffstat (limited to 'src/dbus/qdbusconnection_p.h')
| -rw-r--r-- | src/dbus/qdbusconnection_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index b733a68856..fff9f29b03 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -254,7 +254,7 @@ private: const QVector<int> &metaTypes, int slotIdx); SignalHookHash::Iterator removeSignalHookNoLock(SignalHookHash::Iterator it); - void disconnectObjectTree(ObjectTreeNode &node); + void collectAllObjects(ObjectTreeNode &node, QSet<QObject *> &set); bool isServiceRegisteredByThread(const QString &serviceName); |