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

Merge remote-tracking branch 'origin/4.1'

Browse Source 
Change-Id: Ie96fa53a88bcd06fa688a579c1d84aaf6f5e905f
This commit is contained in:
Orgad Shaneh
2016-07-29 16:12:02 +03:00
parent cda7a3188f 5c5197d19d
commit 35d7352b3e
289 changed files with 1567 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -664,7 +664,7 @@ void QmlEngine::interruptInferior()
{
showMessage(INTERRUPT, LogInput);
d->runDirectCommand(INTERRUPT);
notifyInferiorStopOk();
showStatusMessage(tr("Waiting for JavaScript engine to interrupt on next statement."));
}
void QmlEngine::executeStep()
@@ -1961,7 +1961,8 @@ void QmlEnginePrivate::messageReceived(const QByteArray &data)
}
engine->notifyInferiorSpontaneousStop();
backtrace();
} else if (engine->state() == InferiorStopOk) {
} else if (engine->state() == InferiorStopRequested) {
engine->notifyInferiorStopOk();
backtrace();
}
}