From 51f095e655ce8b4b1d73d0d11817bb839a91c1df Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 17 May 2017 13:07:14 +0200 Subject: 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 Reviewed-by: Lars Knoll --- src/dbus/qdbusintegrator.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/dbus/qdbusintegrator.cpp') diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index e1e588b850..16cd021d0d 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -1039,6 +1039,7 @@ QDBusConnectionPrivate::QDBusConnectionPrivate(QObject *p) qdbusThreadDebug = qdbusDefaultThreadDebug; #endif + QDBusMetaTypeId::init(); connect(this, &QDBusConnectionPrivate::dispatchStatusChanged, this, &QDBusConnectionPrivate::doDispatch, Qt::QueuedConnection); connect(this, &QDBusConnectionPrivate::spyHooksFinished, -- cgit v1.2.3