diff options
author | Jan Arne Petersen <jpetersen@openismus.com> | 2012-10-15 10:30:55 (GMT) |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-31 23:55:00 (GMT) |
commit | 9b4bd98744623f81b7b0950e207209f0c19adb46 (patch) | |
tree | 9078f55d9a95e13214beb5ff0aae9fddfe78d4b5 /src/dbus/qdbusconnection_p.h | |
parent | 7c60bee5678aaf5ca2141de65d173a4704bb259e (diff) | |
download | Qt-9b4bd98744623f81b7b0950e207209f0c19adb46.zip Qt-9b4bd98744623f81b7b0950e207209f0c19adb46.tar.gz Qt-9b4bd98744623f81b7b0950e207209f0c19adb46.tar.bz2 |
Fix QDBusServer with more than one connection
Create a new QDBusConnectionPrivate for every new connection in
qDBusNewConnection instead of creating a single QDBusConnectionPrivate
in the QDBusServer constructor which gets assigned the latest connected
DBusConnection in qDBusNewConnection (and loses track on all previous
DBusConnections).
Also extend tst_QDBusConnection::registerObjectPeer() test with multiple
connections to the server.
Task-Number: QTBUG-24921
Change-Id: I4341e8d48d464f3fe0a314a6ab14f848545d65a0
(cherry picked from qtbase/a386194f9952683c0be5028f2b7f0ce9617fe404)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusconnection_p.h')
-rw-r--r-- | src/dbus/qdbusconnection_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index 2443fca..476456a 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -274,6 +274,7 @@ public: QDBusConnection::ConnectionCapabilities capabilities; QString name; // this connection's name QString baseService; // this connection's base service + QStringList serverConnectionNames; ConnectionMode mode; |