diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-05-17 13:07:14 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-05-17 13:42:47 +0000 |
| commit | 51f095e655ce8b4b1d73d0d11817bb839a91c1df (patch) | |
| tree | 51748dc09aceacedee36b166562c133a27e93abd /src/dbus/qdbusintegrator.cpp | |
| parent | 3f1548ae82d4321b6fdbbf127dafbdf385374be0 (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/qdbusintegrator.cpp')
| -rw-r--r-- | src/dbus/qdbusintegrator.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
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, |