summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbusabstractinterface.cpp
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2012-05-02 22:36:40 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-02 22:49:26 +0200
commit972464262166752df0015fe1209a7ab307cc7105 (patch)
tree85534a986d8e3d689461c0066d0f2782c2a4897d /src/dbus/qdbusabstractinterface.cpp
parent31a5fb1fa297f292e8fba2df947fc18c217445fa (diff)
Fix unit confusion in ccf3b9e48b2d773999a9a88e249f79380618cde6
I wrote nonsense in that commit. The older methods that take a timeout all take milliseconds, and the comments in the unit test really meant milliseconds, not seconds. 1s is not shorter than 100ms.... Change-Id: Ic18899bb0462d89575dc5a9a311478adc4dea1cb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusabstractinterface.cpp')
-rw-r--r--src/dbus/qdbusabstractinterface.cpp4
1 files changed, 2 insertions, 2 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