Merge remote-tracking branch 'origin/4.0'

Conflicts:
	src/plugins/debugger/watchdata.cpp
	src/plugins/debugger/watchdata.h
	src/shared/qbs

Change-Id: I19b338b316d9c4c046074eb85b3fec79e86e6c32
This commit is contained in:
Eike Ziller
2016-06-09 12:07:01 +02:00
10 changed files with 147 additions and 86 deletions

View File

@@ -652,7 +652,6 @@ void CdbEngine::setupInferior()
symbolPaths += symbolPath;
runCommand({".sympath \"" + symbolPaths.join(';') + '"', NoFlags});
runCommand({"!sym noisy", NoFlags}); // Show symbol load information.
runCommand({"sxn 0x4000001f", NoFlags}); // Do not break on WowX86 exceptions.
runCommand({"sxn ibp", NoFlags}); // Do not break on initial breakpoints.
runCommand({".asm source_line", NoFlags}); // Source line in assembly