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

QmlDebugger: Always use ',block' argument

Browse Source 
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: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
This commit is contained in:
Kai Koehne
2011-06-08 10:54:24 +02:00
committed by Christiaan Janssen
parent 5a1f5c6fc8
commit 3485d7f5ca
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/debuggerrunner.cpp
View File

@@ -745,8 +745,8 @@ static DebuggerStartParameters localStartParameters(RunConfiguration *runConfigu
sp.environment.set(optimizerKey, _("1")); sp.environment.set(optimizerKey, _("1"));
} }
Utils::QtcProcess::addArg(&sp.processArgs, _("-qmljsdebugger=port:") Utils::QtcProcess::addArg(&sp.processArgs, QString("-qmljsdebugger=port:%1,block").arg(
+ QString::number(sp.qmlServerPort)); sp.qmlServerPort));
} }
// FIXME: If it's not yet build this will be empty and not filled // FIXME: If it's not yet build this will be empty and not filled

2
src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
View File

@@ -202,7 +202,7 @@ RunControl *QmlProjectRunControlFactory::createDebugRunControl(QmlProjectRunConf
params.executable = runConfig->observerPath(); params.executable = runConfig->observerPath();
params.qmlServerAddress = "127.0.0.1"; params.qmlServerAddress = "127.0.0.1";
params.qmlServerPort = runConfig->qmlDebugServerPort(); 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.processArgs += QLatin1Char(' ') + runConfig->viewerArguments();
params.workingDirectory = runConfig->workingDirectory(); params.workingDirectory = runConfig->workingDirectory();
params.environment = runConfig->environment(); params.environment = runConfig->environment();

2
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View File

@@ -313,7 +313,7 @@ QString S60DeviceRunConfiguration::qmlCommandLineArguments() const
QTC_ASSERT(activeDeployConf, return args); QTC_ASSERT(activeDeployConf, return args);
if (activeDeployConf->communicationChannel() == S60DeployConfiguration::CommunicationCodaTcpConnection) if (activeDeployConf->communicationChannel() == S60DeployConfiguration::CommunicationCodaTcpConnection)
args = QString("-qmljsdebugger=port:%1").arg(qmlDebugServerPort()); args = QString("-qmljsdebugger=port:%1,block").arg(qmlDebugServerPort());
else else
args = QString("-qmljsdebugger=ost"); args = QString("-qmljsdebugger=ost");
} }