From 9e0a51bf8c3cdac61e54a657ed944d963d899ad7 Mon Sep 17 00:00:00 2001 From: Tom Sutcliffe Date: Wed, 23 Mar 2011 16:02:22 +0000 Subject: [PATCH] Fixes for QML debugging over USB OST --- src/plugins/debugger/qml/qmlengine.cpp | 6 +++--- .../qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp | 5 ++++- src/shared/symbianutils/symbiandevicemanager.cpp | 7 ++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index f36bbf24a3e..f35c8cd82e3 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -300,9 +300,9 @@ void QmlEngine::filterApplicationMessage(const QString &msg, int /*channel*/) QString status = msg; status.remove(0, index + qddserver.length()); // chop of 'QDeclarativeDebugServer: ' - static QString waitingForConnection = QLatin1String("Waiting for connection on port"); - static QString unableToListen = QLatin1String("Unable to listen on port"); - static QString debuggingNotEnabled = QLatin1String("Ignoring \"-qmljsdebugger=port:"); + static QString waitingForConnection = QLatin1String("Waiting for connection "); + static QString unableToListen = QLatin1String("Unable to listen "); + static QString debuggingNotEnabled = QLatin1String("Ignoring \"-qmljsdebugger="); static QString connectionEstablished = QLatin1String("Connection established"); QString errorMessage; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp index 78e519a2aea..11e35fcd3cd 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp @@ -470,7 +470,10 @@ static Debugger::DebuggerStartParameters s60DebuggerStartParams(const S60DeviceR if (rc->useQmlDebugger()) { if (sp.processArgs.length()) sp.processArgs.prepend(" "); - sp.processArgs.prepend(QString("-qmljsdebugger=port:%1").arg(sp.qmlServerPort)); + if (activeDeployConf->communicationChannel() == S60DeployConfiguration::CommunicationCodaTcpConnection) + sp.processArgs.prepend(QString("-qmljsdebugger=port:%1").arg(sp.qmlServerPort)); + else + sp.processArgs.prepend(QString("-qmljsdebugger=ost")); } sp.communicationChannel = activeDeployConf->communicationChannel() == S60DeployConfiguration::CommunicationCodaTcpConnection? diff --git a/src/shared/symbianutils/symbiandevicemanager.cpp b/src/shared/symbianutils/symbiandevicemanager.cpp index 27fc5934178..7482bf04365 100644 --- a/src/shared/symbianutils/symbiandevicemanager.cpp +++ b/src/shared/symbianutils/symbiandevicemanager.cpp @@ -699,11 +699,12 @@ qint64 OstChannel::writeData(const char *data, qint64 maxSize) { static const qint64 KMaxOstPayload = 1024; // If necessary, split the packet up - while (maxSize) { - QByteArray dataBuf = QByteArray::fromRawData(data, qMin(KMaxOstPayload, maxSize)); + qint64 remainder = maxSize; + while (remainder) { + QByteArray dataBuf = QByteArray::fromRawData(data, qMin(KMaxOstPayload, remainder)); d->m_codaPtr->writeCustomData(d->m_channelId, dataBuf); data += dataBuf.length(); - maxSize -= dataBuf.length(); + remainder -= dataBuf.length(); } return maxSize; }