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

Added some support for QML debugging over USB. Fixed some issues with -qmljsdebugger option.

Browse Source 
Not fully working over USB yet, there are some handshaking issues that need to be addressed. WLAN might be improved due to the -qmljsdebugger fixes, but not tested.
This commit is contained in:
Tom Sutcliffe
2011-02-23 12:10:51 +01:00
committed by Kai Koehne
parent ed79c97d83
commit 48fef07a08
4 changed files with 163 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/debugger/qml/qmladapter.cpp
View File

@@ -100,7 +100,7 @@ void QmlAdapter::closeConnection()
d->m_connectionTimer.stop();
} else {
if (d->m_conn) {
d->m_conn->disconnectFromHost();
d->m_conn->close();
}
}
}
@@ -127,11 +127,23 @@ void QmlAdapter::connectToViewer()
|| (d->m_conn && d->m_conn->state() != QAbstractSocket::UnconnectedState))
return;
QString address = d->m_engine.data()->startParameters().qmlServerAddress;
quint16 port = d->m_engine.data()->startParameters().qmlServerPort;
showConnectionStatusMessage(
tr("Connect to debug server %1:%2").arg(address).arg(QString::number(port)));
d->m_conn->connectToHost(address, port);
const DebuggerStartParameters &parameters = d->m_engine.data()->startParameters();
if (parameters.communicationChannel == DebuggerStartParameters::CommunicationChannelUsb) {
if (parameters.debugClient == DebuggerStartParameters::DebugClientTrk) {
d->m_connectionTimer.stop();
showConnectionErrorMessage(tr("QML debugging is not supported when using TRK!"));
emit connectionStartupFailed();
return;
}
const QString &port = parameters.remoteChannel;
showConnectionStatusMessage(tr("Connecting to debug server on %1").arg(port));
d->m_conn->connectToOst(port);
} else {
const QString &address = parameters.qmlServerAddress;
quint16 port = parameters.qmlServerPort;
showConnectionStatusMessage(tr("Connecting to debug server %1:%2").arg(address).arg(QString::number(port)));
d->m_conn->connectToHost(address, port);
}
}
void QmlAdapter::sendMessage(const QByteArray &msg)
@@ -147,7 +159,7 @@ void QmlAdapter::sendMessage(const QByteArray &msg)
void QmlAdapter::connectionErrorOccurred(QAbstractSocket::SocketError socketError)
{
showConnectionStatusMessage(tr("Error: (%1) %2", "%1=error code, %2=error message")
.arg(d->m_conn->error()).arg(d->m_conn->errorString()));
.arg(socketError).arg(d->m_conn->errorString()));
// this is only an error if we are already connected and something goes wrong.
if (isConnected())