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

Debugger: Make language to debug (QML/CPP) explicit

Browse Source 
Make the choice of language part of the DebuggerStartParameters,
instead of deriving it indirectly from the current project. This
prevents e.g. the QmlCppEngine to be used when loading core files.

Change-Id: I9d1c9ab318ba789abe3a6ea0478ebda71857e793
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Kai Koehne
2012-02-01 09:03:05 +01:00
committed by hjk
parent e46a5579d3
commit fe8cead2d0
7 changed files with 72 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -373,12 +373,12 @@ void QmlEngine::runEngine()
{
QTC_ASSERT(state() == EngineRunRequested, qDebug() << state());
if (!isSlaveEngine() && startParameters().startMode != AttachToRemoteServer
&& startParameters().startMode != AttachToQmlPort)
startApplicationLauncher();
if (startParameters().startMode == AttachToQmlPort)
beginConnection();
if (!isSlaveEngine()) {
if (startParameters().startMode != AttachToRemoteServer)
startApplicationLauncher();
else
beginConnection();
}
}
void QmlEngine::startApplicationLauncher()