diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-07-29 16:12:02 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-07-29 16:13:18 +0300 |
| commit | 35d7352b3e2965768f90dc3f2ac17aec68af5df5 (patch) | |
| tree | e9ce2b482fe1a4ea965701154ba4967256202462 /src/plugins/debugger/qml/qmlengine.cpp | |
| parent | cda7a3188f86f6a506225a679e123ee72b8c4f76 (diff) | |
| parent | 5c5197d19d31a7c81f5bfb64a666b589bbd5638c (diff) | |
| download | qt-creator-35d7352b3e2965768f90dc3f2ac17aec68af5df5.tar.gz | |
Merge remote-tracking branch 'origin/4.1'
Change-Id: Ie96fa53a88bcd06fa688a579c1d84aaf6f5e905f
Diffstat (limited to 'src/plugins/debugger/qml/qmlengine.cpp')
| -rw-r--r-- | src/plugins/debugger/qml/qmlengine.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index c6961ad62d..0d4ec99880 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -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(); } } |