feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDebugging: Add service client for QmlDebugger

Browse Source 
Qt5 has renamed the service 'QDeclarativeEngine' to 'QmlDebugger'.
Add a new client to connect to the service.

Change-Id: I3a03181c4f34c311e47d4a963283b66dc778726b
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Aurindam Jana
2012-03-15 12:11:41 +01:00
parent 4cd2e32659
commit 66ed2b37ba
10 changed files with 243 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/plugins/qmljsinspector/qmljsclientproxy.cpp
View File

@@ -72,18 +72,20 @@ ClientProxy::~ClientProxy()
void ClientProxy::connectToServer()
{
m_engineClient = new QmlEngineDebugClient(m_adapter.data()->connection());
QmlEngineDebugClient *client1 = new QDeclarativeEngineClient(
m_adapter.data()->connection());
QmlEngineDebugClient *client2 = new QmlDebuggerClient(
m_adapter.data()->connection());
connect(m_engineClient, SIGNAL(newObjects()), this, SLOT(newObjects()));
connect(m_engineClient, SIGNAL(newStatus(QDeclarativeDebugClient::Status)),
connect(client1, SIGNAL(newStatus(QDeclarativeDebugClient::Status)),
SLOT(clientStatusChanged(QDeclarativeDebugClient::Status)));
connect(m_engineClient, SIGNAL(newStatus(QDeclarativeDebugClient::Status)),
connect(client1, SIGNAL(newStatus(QDeclarativeDebugClient::Status)),
SLOT(engineClientStatusChanged(QDeclarativeDebugClient::Status)));
connect(m_engineClient, SIGNAL(result(quint32,QVariant)),
SLOT(onResult(quint32,QVariant)));
connect(m_engineClient, SIGNAL(valueChanged(int,QByteArray,QVariant)),
SLOT(objectWatchTriggered(int,QByteArray,QVariant)));
connect(client2, SIGNAL(newStatus(QDeclarativeDebugClient::Status)),
SLOT(clientStatusChanged(QDeclarativeDebugClient::Status)));
connect(client2, SIGNAL(newStatus(QDeclarativeDebugClient::Status)),
SLOT(engineClientStatusChanged(QDeclarativeDebugClient::Status)));
m_inspectorClient =
new QmlJSInspectorClient(m_adapter.data()->connection(), this);
@@ -135,8 +137,14 @@ void ClientProxy::clientStatusChanged(QDeclarativeDebugClient::Status status)
void ClientProxy::engineClientStatusChanged(QDeclarativeDebugClient::Status status)
{
if (status == QDeclarativeDebugClient::Enabled) {
m_adapter.data()->setEngineDebugClient(
qobject_cast<QmlEngineDebugClient *>(sender()));
m_engineClient = qobject_cast<QmlEngineDebugClient *>(sender());
connect(m_engineClient, SIGNAL(newObjects()), this, SLOT(newObjects()));
connect(m_engineClient, SIGNAL(result(quint32,QVariant)),
SLOT(onResult(quint32,QVariant)));
connect(m_engineClient, SIGNAL(valueChanged(int,QByteArray,QVariant)),
SLOT(objectWatchTriggered(int,QByteArray,QVariant)));
m_adapter.data()->setEngineDebugClient(m_engineClient);
updateConnected();
}
}