summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbusabstractinterface_p.h
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2011-08-18 17:48:35 +0200
committerQt by Nokia <qt-info@nokia.com>2011-08-25 11:36:52 +0200
commit7347a5f99df2da154acb1bdc538d4bc771cab066 (patch)
tree86008195f20f95b8616802e088d45a3994a824a6 /src/dbus/qdbusabstractinterface_p.h
parentbdc417b3828737334723eae23097c85f70c23a33 (diff)
Make the DBus timeout configurable in QDBusAbstractInterface.
Merge-request: 1253 Reviewed-by: Thiago Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com> (cherry picked from commit e58a402fbee2fc8af8cd651acafdc28525ed1314) Change-Id: I4246047b149193e510f2984a0b1a1fae655b9a51 Reviewed-on: http://codereview.qt.nokia.com/3580 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Diffstat (limited to 'src/dbus/qdbusabstractinterface_p.h')
-rw-r--r--src/dbus/qdbusabstractinterface_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/dbus/qdbusabstractinterface_p.h b/src/dbus/qdbusabstractinterface_p.h
index a000dafa8b..4f96165aa0 100644
--- a/src/dbus/qdbusabstractinterface_p.h
+++ b/src/dbus/qdbusabstractinterface_p.h
@@ -77,6 +77,7 @@ public:
QString path;
QString interface;
mutable QDBusError lastError;
+ int timeout;
// this is set during creation and never changed
// it can't be const because QDBusInterfacePrivate has one more check