diff --git a/src/plugins/debugger/qml/qmladapter.cpp b/src/plugins/debugger/qml/qmladapter.cpp index 46d9cdcb9d3..184f648af4d 100644 --- a/src/plugins/debugger/qml/qmladapter.cpp +++ b/src/plugins/debugger/qml/qmladapter.cpp @@ -163,10 +163,13 @@ void QmlAdapter::connectionErrorOccurred(QAbstractSocket::SocketError socketErro void QmlAdapter::clientStatusChanged(QDeclarativeDebugClient::Status status) { QString serviceName; - if (QDeclarativeDebugClient *client = qobject_cast(sender())) + float version = 0; + if (QDeclarativeDebugClient *client = qobject_cast(sender())) { serviceName = client->name(); + version = client->serviceVersion(); + } - logServiceStatusChange(serviceName, status); + logServiceStatusChange(serviceName, version, status); } void QmlAdapter::debugClientStatusChanged(QDeclarativeDebugClient::Status status) @@ -346,21 +349,24 @@ void QmlAdapter::setCurrentSelectedDebugInfo(int currentDebugId, const QString & emit selectionChanged(); } -void QmlAdapter::logServiceStatusChange(const QString &service, +void QmlAdapter::logServiceStatusChange(const QString &service, float version, QDeclarativeDebugClient::Status newStatus) { switch (newStatus) { case QDeclarativeDebugClient::Unavailable: { - showConnectionStatusMessage(tr("Status of '%1' changed to 'unavailable'.").arg(service)); + showConnectionStatusMessage(tr("Status of '%1' Version: %2 changed to 'unavailable'."). + arg(service).arg(QString::number(version))); break; } case QDeclarativeDebugClient::Enabled: { - showConnectionStatusMessage(tr("Status of '%1' changed to 'enabled'.").arg(service)); + showConnectionStatusMessage(tr("Status of '%1' Version: %2 changed to 'enabled'."). + arg(service).arg(QString::number(version))); break; } case QDeclarativeDebugClient::NotConnected: { - showConnectionStatusMessage(tr("Status of '%1' changed to 'not connected'.").arg(service)); + showConnectionStatusMessage(tr("Status of '%1' Version: %2 changed to 'not connected'."). + arg(service).arg(QString::number(version))); break; } } diff --git a/src/plugins/debugger/qml/qmladapter.h b/src/plugins/debugger/qml/qmladapter.h index 8851518836e..8df5593d8b3 100644 --- a/src/plugins/debugger/qml/qmladapter.h +++ b/src/plugins/debugger/qml/qmladapter.h @@ -86,7 +86,7 @@ public: void setCurrentSelectedDebugInfo(int debugId, const QString &displayName = QString()); public slots: - void logServiceStatusChange(const QString &service, QDeclarativeDebugClient::Status newStatus); + void logServiceStatusChange(const QString &service, float version, QDeclarativeDebugClient::Status newStatus); void logServiceActivity(const QString &service, const QString &logMessage); signals: diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.cpp b/src/plugins/qmljsinspector/qmljsclientproxy.cpp index 171e1fee1db..66a50141c4e 100644 --- a/src/plugins/qmljsinspector/qmljsclientproxy.cpp +++ b/src/plugins/qmljsinspector/qmljsclientproxy.cpp @@ -117,12 +117,14 @@ void ClientProxy::connectToServer() void ClientProxy::clientStatusChanged(QDeclarativeDebugClient::Status status) { QString serviceName; - if (sender()) { - serviceName = sender()->objectName(); + float version = 0; + if (QDeclarativeDebugClient *client = qobject_cast(sender())) { + serviceName = client->name(); + version = client->serviceVersion(); } if (m_adapter) - m_adapter.data()->logServiceStatusChange(serviceName, status); + m_adapter.data()->logServiceStatusChange(serviceName, version, status); updateConnected(); }