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: Ia442f30f387fe9292217582260bbe79e54608810
This commit is contained in:
Orgad Shaneh
2016-08-05 11:59:28 +03:00
committed by Ulf Hermann
parent 713bc04ad4 d004203b13
commit 1853f01a5b
125 changed files with 1416 additions and 1407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1084,7 +1084,7 @@ void QmlEngine::quitDebugger()
d->noDebugOutputTimer.stop();
d->automaticConnect = false;
d->retryOnConnectFail = false;
DebuggerEngine::quitDebugger();
shutdownInferior();
}
void QmlEngine::disconnected()
@@ -2150,7 +2150,7 @@ void QmlEnginePrivate::handleFrame(const QVariantMap &response)
StackHandler *stackHandler = engine->stackHandler();
WatchHandler * watchHandler = engine->watchHandler();
watchHandler->notifyUpdateStarted();
watchHandler->notifyUpdateStarted({"local"});
const int frameIndex = stackHandler->currentIndex();
if (frameIndex < 0)