diff options
| author | Jan Arne Petersen <jpetersen@openismus.com> | 2012-03-23 13:58:04 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-14 01:02:06 +0200 |
| commit | a386194f9952683c0be5028f2b7f0ce9617fe404 (patch) | |
| tree | 4ca5fe5802000566450f5eff7ed6784067b9804f /src/dbus/qdbusconnection_p.h | |
| parent | 019bb22ff1f340a9b14d4f93898c6cda376ee1a0 (diff) | |
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: 24921
Change-Id: I4341e8d48d464f3fe0a314a6ab14f848545d65a0
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 d249789a5f..4ecbe0602c 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -276,6 +276,7 @@ public: QDBusConnection::ConnectionCapabilities capabilities; QString name; // this connection's name QString baseService; // this connection's base service + QStringList serverConnectionNames; ConnectionMode mode; |