3 files changed, 4 insertions, 10 deletions
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp
index 1a7c417..4e9c1ad 100644
--- a/src/dbus/qdbusabstractinterface.cpp
+++ b/src/dbus/qdbusabstractinterface.cpp
@@ -42,6 +42,8 @@
 #include "qdbusabstractinterface.h"
 #include "qdbusabstractinterface_p.h"
 
+#include <qthread.h>
+
 #include "qdbusargument.h"
 #include "qdbuspendingcall.h"
 #include "qdbusmessage_p.h"
@@ -440,7 +442,8 @@ QDBusMessage QDBusAbstractInterface::callWithArgumentList(QDBus::CallMode mode,
     msg.setArguments(args);
 
     QDBusMessage reply = d->connection.call(msg, mode);
-    d->lastError = reply;       // will clear if reply isn't an error
+    if (thread() == QThread::currentThread())
+        d->lastError = reply;       // will clear if reply isn't an error
 
     // ensure that there is at least one element
     if (reply.arguments().isEmpty())
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index abb3224..4382032 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -1003,14 +1003,6 @@ void QDBusConnectionPrivate::setSender(const QDBusConnectionPrivate *s)
 /*!
   \internal
 */
-void QDBusConnectionPrivate::setConnection(const QString &name, QDBusConnectionPrivate *c)
-{
-    _q_manager()->setConnection(name, c);
-}
-
-/*!
-  \internal
-*/
 void QDBusConnectionPrivate::setBusService(const QDBusConnection &connection)
 {
     busService = new QDBusConnectionInterface(connection, this);
diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h
index 34bb6b3..81af2c7 100644
--- a/src/dbus/qdbusconnection_p.h
+++ b/src/dbus/qdbusconnection_p.h
@@ -309,7 +309,6 @@ public:
     static QDBusConnection q(QDBusConnectionPrivate *connection) { return QDBusConnection(connection); }
 
     static void setSender(const QDBusConnectionPrivate *s);
-    static void setConnection(const QString &name, QDBusConnectionPrivate *c);
 
     friend class QDBusActivateObjectEvent;
     friend class QDBusCallDeliveryEvent;