summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2015-10-04 01:00:09 -0400
committerThiago Macieira <thiago.macieira@intel.com>2016-05-09 16:21:50 +0000
commit50723bf3d0d56ba58dbf2343ea890b2d874239e9 (patch)
treeab67a042a0a858ee7d6cf2601428e5bb4ec394f2
parent844ea8beea8d8edb68fea18017cdc57592b2808c (diff)
Make sure the QDBusVirtualObject virtuals are called in the right thread
Change-Id: I42e7ef1a481840699a8dffff1409e30f191e822f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
-rw-r--r--tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp
index 93d3eacb08..91cae3272a 100644
--- a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp
+++ b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp
@@ -407,6 +407,7 @@ public:
VirtualObject() :success(true) {}
QString introspect(const QString &path) const {
+ Q_ASSERT(QThread::currentThread() == thread());
if (path == "/some/path/superNode")
return "zitroneneis";
if (path == "/some/path/superNode/foo")
@@ -417,6 +418,7 @@ public:
}
bool handleMessage(const QDBusMessage &message, const QDBusConnection &connection) {
+ Q_ASSERT(QThread::currentThread() == thread());
++callCount;
lastMessage = message;