From 966b2f97b655a59bebfead9f127f3f71e0c7e57c Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 20 Mar 2021 18:52:01 +0200 Subject: [PATCH] add new thread action enum and use it for QDBusConnectionPrivate::isServiceRegisteredByThread() Signed-off-by: Ivailo Monev --- src/dbus/qdbusintegrator.cpp | 2 +- src/dbus/qdbusthreaddebug_p.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index 6fdf8ef85..278a6b5b9 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -2377,7 +2377,7 @@ bool QDBusConnectionPrivate::isServiceRegisteredByThread(const QString &serviceN if (serviceName == dbusServiceString()) return false; - QDBusReadLocker locker(UnregisterServiceAction, this); + QDBusReadLocker locker(ServiceRegisteredAction, this); return serviceNames.contains(serviceName); } diff --git a/src/dbus/qdbusthreaddebug_p.h b/src/dbus/qdbusthreaddebug_p.h index 90595a93b..20b334bcd 100644 --- a/src/dbus/qdbusthreaddebug_p.h +++ b/src/dbus/qdbusthreaddebug_p.h @@ -55,6 +55,7 @@ enum ThreadAction { RegisterObjectAction = 2, UnregisterObjectAction = 3, ObjectRegisteredAtAction = 4, + ServiceRegisteredAction = 5, CloseConnectionAction = 10, ObjectDestroyedAction = 11,