summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbusconnection.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-05-17 13:07:14 +0200
committerLars Knoll <lars.knoll@qt.io>2017-05-17 13:42:47 +0000
commit51f095e655ce8b4b1d73d0d11817bb839a91c1df (patch)
tree51748dc09aceacedee36b166562c133a27e93abd /src/dbus/qdbusconnection.cpp
parent3f1548ae82d4321b6fdbbf127dafbdf385374be0 (diff)
Revert "Merge the QDBusMetaType's custom information to QDBusConnectionManager"
This reverts commit daeb334039e9dcc01485995f53552749131a06b7. The commit was causing race conditions, and random failures in CI. Task-number: QTBUG-60792 Change-Id: I6e49b733965632a1a268f0e88809794098465ec0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/dbus/qdbusconnection.cpp')
-rw-r--r--src/dbus/qdbusconnection.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index 8fae11c8cd..75c1e92f96 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -190,7 +190,6 @@ void QDBusConnectionManager::run()
}
}
connectionHash.clear();
- customTypes.clear();
// allow deletion from any thread without warning
moveToThread(Q_NULLPTR);