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

Merge remote branch 'origin/2.1'

Browse Source 
Conflicts:
	doc/qtcreator.qdoc
	share/qtcreator/templates/mobileapp/app.pro
This commit is contained in:
Oswald Buddenhagen
2010-10-25 11:27:30 +02:00
parent 3b2614c697 49bb852292
commit 35bb61590d
83 changed files with 83178 additions and 77579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -260,9 +260,13 @@ void QmlEngine::shutdownInferiorAsSlave()
if (state() == InferiorRunOk) {
setState(InferiorStopRequested);
setState(InferiorStopOk);
setState(InferiorShutdownRequested);
setState(InferiorShutdownOk);
} else {
// force
setState(InferiorShutdownRequested, true);
setState(InferiorShutdownOk);
}
setState(InferiorShutdownRequested);
setState(InferiorShutdownOk);
}
void QmlEngine::shutdownEngineAsSlave()
@@ -683,6 +687,8 @@ void QmlEngine::messageReceived(const QByteArray &message)
if (processedFilename == file
&& data->lineNumber == line) {
data->pending = false;
data->bpFileName = file;
data->bpLineNumber = line;
data->updateMarker();
}
}