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

Merge remote-tracking branch 'origin/3.6' into 4.0

Browse Source 
Conflicts:
	src/plugins/projectexplorer/applicationlauncher.cpp
	src/plugins/projectexplorer/applicationlauncher.h
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp
	src/plugins/qtsupport/uicodemodelsupport.cpp
	src/plugins/qtsupport/uicodemodelsupport.h

Change-Id: I6f6ae77422d99f4f422b108ade6b64273df9dd57
This commit is contained in:
Eike Ziller
2016-03-03 16:10:04 +01:00
parent 0aeb654685 fc57682120
commit f4e87a7e0c
10 changed files with 63 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/debugger/lldb/lldbengine.cpp
View File

@@ -536,11 +536,7 @@ void LldbEngine::selectThread(ThreadId threadId)
DebuggerCommand cmd("selectThread");
cmd.arg("id", threadId.raw());
cmd.callback = [this](const DebuggerResponse &) {
DebuggerCommand cmd("fetchStack");
cmd.arg("nativemixed", isNativeMixedActive());
cmd.arg("stacklimit", action(MaximalStackDepth)->value().toInt());
runCommand(cmd);
updateLocals();
fetchStack(action(MaximalStackDepth)->value().toInt());
};
runCommand(cmd);
}