diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2011-06-08 10:54:24 +0200 |
|---|---|---|
| committer | Christiaan Janssen <christiaan.janssen@nokia.com> | 2011-06-08 14:39:13 +0200 |
| commit | 3485d7f5cac871cfa5418a2237d4d5da422991fe (patch) | |
| tree | 93475e07c3068b0276e418e8e3aa7c8fab07a6e9 /src/plugins | |
| parent | 5a1f5c6fc87e3e16596b2c355d426186aedb3e59 (diff) | |
| download | qt-creator-3485d7f5cac871cfa5418a2237d4d5da422991fe.tar.gz | |
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: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/debugger/debuggerrunner.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index 89d4437a2e..cf83be4186 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -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 diff --git a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp index 0685af95b6..07e31679f0 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp @@ -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(); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp index ee61aaee7f..0f36a53663 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp @@ -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"); } |