diff options
author | Alexander Volkov <avolkov@astralinux.ru> | 2021-07-28 18:09:37 +0300 |
---|---|---|
committer | Alexander Volkov <avolkov@astralinux.ru> | 2021-07-29 11:22:43 +0300 |
commit | 09e01c0db4e3eeb06692168d43477622e8a095f8 (patch) | |
tree | 909e2ebadfc420aa29cbd01270a814ecda2715ce /src/qdbus/qdbusviewer/qdbusviewer.cpp | |
parent | 89ddd2e6259d3425fee57a19f36f9cd60a06f76a (diff) |
qdbusviewer: Display errors for dbus method calls
Fixes: QTBUG-68600
Change-Id: I65c9084e55f514e3cd2c4e72743eae1b94d82501
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/qdbus/qdbusviewer/qdbusviewer.cpp')
-rw-r--r-- | src/qdbus/qdbusviewer/qdbusviewer.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/qdbus/qdbusviewer/qdbusviewer.cpp b/src/qdbus/qdbusviewer/qdbusviewer.cpp index 87b1c4dfe..d278baa93 100644 --- a/src/qdbus/qdbusviewer/qdbusviewer.cpp +++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp @@ -257,7 +257,7 @@ void QDBusViewer::getProperty(const BusSignature &sig) QList<QVariant> arguments; arguments << sig.mInterface << sig.mName; message.setArguments(arguments); - c.callWithCallback(message, this, SLOT(dumpMessage(QDBusMessage))); + c.callWithCallback(message, this, SLOT(dumpMessage(QDBusMessage)), SLOT(dumpError(QDBusError))); } void QDBusViewer::setProperty(const BusSignature &sig) @@ -284,8 +284,7 @@ void QDBusViewer::setProperty(const BusSignature &sig) QList<QVariant> arguments; arguments << sig.mInterface << sig.mName << QVariant::fromValue(QDBusVariant(value)); message.setArguments(arguments); - c.callWithCallback(message, this, SLOT(dumpMessage(QDBusMessage))); - + c.callWithCallback(message, this, SLOT(dumpMessage(QDBusMessage)), SLOT(dumpError(QDBusError))); } static QString getDbusSignature(const QMetaMethod& method) @@ -361,7 +360,7 @@ void QDBusViewer::callMethod(const BusSignature &sig) QDBusMessage message = QDBusMessage::createMethodCall(sig.mService, sig.mPath, sig.mInterface, sig.mName); message.setArguments(args); - c.callWithCallback(message, this, SLOT(dumpMessage(QDBusMessage))); + c.callWithCallback(message, this, SLOT(dumpMessage(QDBusMessage)), SLOT(dumpError(QDBusError))); } void QDBusViewer::showContextMenu(const QPoint &point) @@ -485,6 +484,11 @@ void QDBusViewer::dumpMessage(const QDBusMessage &message) log->append(out); } +void QDBusViewer::dumpError(const QDBusError &error) +{ + logError(error.message()); +} + void QDBusViewer::serviceChanged(const QModelIndex &index) { delete tree->model(); |