diff options
| author | David Faure <faure@kde.org> | 2012-05-03 09:05:27 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 07:34:13 (GMT) |
| commit | ffc21ca1a90ddd2920108ff25e10aab3c8335b30 (patch) | |
| tree | 79e161a3c25e231ec9591b07a847693b3292dc90 /src | |
| parent | 841d72500ce2763f4ce00c5979658a397491d5be (diff) | |
| download | Qt-ffc21ca1a90ddd2920108ff25e10aab3c8335b30.zip Qt-ffc21ca1a90ddd2920108ff25e10aab3c8335b30.tar.gz Qt-ffc21ca1a90ddd2920108ff25e10aab3c8335b30.tar.bz2 | |
Pass configured timeout to callWithCallback too.
This was missing in ccf3b9e48b2d773999a9a88e249f79380618cde6.
Backport of ac86c8397ceca7c46de6f104c7031716e053f9fb
Change-Id: Ia473ef581db91506ea72e777a727d4b786ae3fee
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/dbus/qdbusabstractinterface.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index e934e1a..43af911 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -544,7 +544,8 @@ bool QDBusAbstractInterface::callWithCallback(const QString &method, return d->connection.callWithCallback(msg, receiver, returnMethod, - errorMethod); + errorMethod, + d->timeout); } /*! |