diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-13 09:34:23 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-13 09:34:23 (GMT) |
| commit | ece530b88059cdfb166a99bba95ef4b70ce4ec66 (patch) | |
| tree | 7af49213a328dfb6a09fbac8f27334d0737430b4 /src/dbus/qdbusinterface.cpp | |
| parent | 6b84baddfb5187219b76d0d9a112db27bee29d2c (diff) | |
| parent | f7a1117cbec5638e32ea04b6a93412b193e07913 (diff) | |
| download | Qt-ece530b88059cdfb166a99bba95ef4b70ce4ec66.zip Qt-ece530b88059cdfb166a99bba95ef4b70ce4ec66.tar.gz Qt-ece530b88059cdfb166a99bba95ef4b70ce4ec66.tar.bz2 | |
Merge commit 'coreteam/4.6' into oslo1-4.6
Diffstat (limited to 'src/dbus/qdbusinterface.cpp')
| -rw-r--r-- | src/dbus/qdbusinterface.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/dbus/qdbusinterface.cpp b/src/dbus/qdbusinterface.cpp index 74b2a44..d0a693f 100644 --- a/src/dbus/qdbusinterface.cpp +++ b/src/dbus/qdbusinterface.cpp @@ -157,7 +157,9 @@ QDBusInterfacePrivate::QDBusInterfacePrivate(const QString &serv, const QString if (!metaObject) { // creation failed, somehow - isValid = false; + // most common causes are that the service doesn't exist or doesn't support introspection + // those are not fatal errors, so we continue working + if (!lastError.isValid()) lastError = QDBusError(QDBusError::InternalError, QLatin1String("Unknown error")); } @@ -232,7 +234,7 @@ QDBusInterface::~QDBusInterface() */ const QMetaObject *QDBusInterface::metaObject() const { - return d_func()->isValid ? d_func()->metaObject : &QDBusAbstractInterface::staticMetaObject; + return d_func()->metaObject ? d_func()->metaObject : &QDBusAbstractInterface::staticMetaObject; } /*! |