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

Merge remote-tracking branch 'origin/2.3'

Browse Source 
Conflicts:
	qtcreator.pri

Change-Id: Iaca68084799ae9aec257742c395609d6e8aa72cd
This commit is contained in:
Eike Ziller
2011-08-16 10:21:55 +02:00
parent 5606b9d239 629de47f92
commit bf8cb5d4fc
25 changed files with 17345 additions and 2631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/qml/qmlcppengine.cpp
View File

@@ -413,7 +413,11 @@ void QmlCppEngine::executeJumpToLine(const ContextData &data)
void QmlCppEngine::executeDebuggerCommand(const QString &command)
{
d->m_cppEngine->executeDebuggerCommand(command);
if (d->m_qmlEngine->state() == InferiorStopOk) {
d->m_qmlEngine->executeDebuggerCommand(command);
} else {
d->m_cppEngine->executeDebuggerCommand(command);
}
}
/////////////////////////////////////////////////////////