Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (57 commits)
  escape quotes meant for the shell
  escape backslashes
  complain about unescaped backslashes
  qaccessibility::eventTest(...) was failing.
  qdoc: Fixed the French version of the address book tutorial
  qdoc: Improved the address book tutorial
  Fix build when snap functionality is not available.
  Dont crash when assigning the same input context twice.
  Fixed a typo in variable name in qlocale data generator.
  Fix for Norwegian and Korean languages on symbian.
  Remove unused function in QDBusConnectionPrivate
  Doc: Fixing bugs in HTML generator
  Updating 4.7.0 change log.
  Doc: Correcting style to class lists
  qdoc: Improved class index page.
  Added MSVC 2010 project files to .gitignore
  Fix architecture detection on GNU/Hurd.
  Revert "tst_bic: make it possible to test for cross-compilation"
  fix typo in documentation
  Improve Bearer Management related documentation in QNetworkAccessManager
  ...

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;