diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:07:32 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-28 11:10:29 +0100 |
| commit | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (patch) | |
| tree | 156ccba392968d3d2ba3bcb5bb098a1ff0b7e8ce /tests/auto/dbus | |
| parent | bf5f2a9e3e3bf70c373b65bf95a332f4e1c514f9 (diff) | |
| parent | 0b68fc019bbeedb8b6b59bbbdf31f66596b6d5ac (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I12b4d8b99bdccae53b1a978cd6eb8f4ac6fb3c76
Diffstat (limited to 'tests/auto/dbus')
| -rw-r--r-- | tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp index c87b3297ee..1da7f8a92a 100644 --- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp +++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp @@ -1055,11 +1055,11 @@ signals: void tst_QDBusConnection::serviceRegistrationRaceCondition() { // There was a race condition in the updating of list of name owners in - // QtDBus. When the user connects to a signal coming from a given + // Qt D-Bus. When the user connects to a signal coming from a given // service, we must listen for NameOwnerChanged signals relevant to that // name and update when the owner changes. However, it's possible that we // receive in one chunk from the server both the NameOwnerChanged signal - // about the service and the signal we're interested in. Since QtDBus + // about the service and the signal we're interested in. Since Qt D-Bus // posts events in order to handle the incoming signals, the update // happens too late. |