Commit 3485d7f5 authored by Kai Koehne's avatar Kai Koehne Committed by Christiaan Janssen
Browse files

QmlDebugger: Always use ',block' argument

This will allow e.g. the JS Debugger to catch scripts running at startup.

Change-Id: I00d339b06f1ed2b716c62bd2d53a32c2b20b1ddc
Reviewed-on: http://codereview.qt.nokia.com/377

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarChristiaan Janssen <christiaan.janssen@nokia.com>
parent 5a1f5c6f
......@@ -745,8 +745,8 @@ static DebuggerStartParameters localStartParameters(RunConfiguration *runConfigu
sp.environment.set(optimizerKey, _("1"));
}
Utils::QtcProcess::addArg(&sp.processArgs, _("-qmljsdebugger=port:")
+ QString::number(sp.qmlServerPort));
Utils::QtcProcess::addArg(&sp.processArgs, QString("-qmljsdebugger=port:%1,block").arg(
sp.qmlServerPort));
}
// FIXME: If it's not yet build this will be empty and not filled
......
......@@ -202,7 +202,7 @@ RunControl *QmlProjectRunControlFactory::createDebugRunControl(QmlProjectRunConf
params.executable = runConfig->observerPath();
params.qmlServerAddress = "127.0.0.1";
params.qmlServerPort = runConfig->qmlDebugServerPort();
params.processArgs = QLatin1String("-qmljsdebugger=port:") + QString::number(runConfig->qmlDebugServerPort());
params.processArgs = QString("-qmljsdebugger=port:%1,block").arg(runConfig->qmlDebugServerPort());
params.processArgs += QLatin1Char(' ') + runConfig->viewerArguments();
params.workingDirectory = runConfig->workingDirectory();
params.environment = runConfig->environment();
......
......@@ -313,7 +313,7 @@ QString S60DeviceRunConfiguration::qmlCommandLineArguments() const
QTC_ASSERT(activeDeployConf, return args);
if (activeDeployConf->communicationChannel() == S60DeployConfiguration::CommunicationCodaTcpConnection)
args = QString("-qmljsdebugger=port:%1").arg(qmlDebugServerPort());
args = QString("-qmljsdebugger=port:%1,block").arg(qmlDebugServerPort());
else
args = QString("-qmljsdebugger=ost");
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment