diff options
| -rw-r--r-- | src/dbus/qdbusabstractinterface.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp | 14 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index 76089f2c7d..c45097de22 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -385,7 +385,7 @@ QDBusError QDBusAbstractInterface::lastError() const } /*! - Sets the timeout in seconds for all future DBus calls to \a timeout. + Sets the timeout in milliseconds for all future DBus calls to \a timeout. -1 means the default DBus timeout (usually 25 seconds). \since 4.8 @@ -396,7 +396,7 @@ void QDBusAbstractInterface::setTimeout(int timeout) } /*! - Returns the current value of the timeout in seconds. + Returns the current value of the timeout in milliseconds. -1 means the default DBus timeout (usually 25 seconds). \since 4.8 diff --git a/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp b/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp index 48ea1e45af..fcc2a32920 100644 --- a/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp +++ b/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp @@ -495,7 +495,7 @@ void tst_QDBusAbstractInterface::callWithTimeout() QDBusMessage msg = QDBusMessage::createMethodCall(server_serviceName, server_objectPath, server_interfaceName, "sleepMethod"); - msg << 100; + msg << 100; // sleep 100 ms { // Call with no timeout -> works @@ -505,7 +505,7 @@ void tst_QDBusAbstractInterface::callWithTimeout() } { - // Call with 1 sec timeout -> fails + // Call with 1 msec timeout -> fails QDBusMessage reply = con.call(msg, QDBus::Block, 1); QCOMPARE(reply.type(), QDBusMessage::ErrorMessage); } @@ -520,11 +520,17 @@ void tst_QDBusAbstractInterface::callWithTimeout() QCOMPARE(reply.arguments().at(0).toInt(), 42); } { - // Call with 1 sec timeout -> fails + // Call with 1 msec timeout -> fails iface.setTimeout(1); QDBusMessage reply = iface.call("sleepMethod", 100); QCOMPARE(reply.type(), QDBusMessage::ErrorMessage); } + { + // Call with 300 msec timeout -> works + iface.setTimeout(300); + QDBusMessage reply = iface.call("sleepMethod", 100); + QCOMPARE(reply.arguments().at(0).toInt(), 42); + } // Now using generated code com::trolltech::QtDBus::Pinger p(server_serviceName, server_objectPath, QDBusConnection::sessionBus()); @@ -535,7 +541,7 @@ void tst_QDBusAbstractInterface::callWithTimeout() QCOMPARE(int(reply), 42); } { - // Call with 1 sec timeout -> fails + // Call with 1 msec timeout -> fails p.setTimeout(1); QDBusReply<int> reply = p.sleepMethod(100); QVERIFY(!reply.isValid()); |