Merge remote-tracking branch 'origin/2.7'

Conflicts:
	doc/src/debugger/qtquick-debugger-example.qdoc

Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3
This commit is contained in:
Eike Ziller
2013-03-18 10:19:14 +01:00
48 changed files with 227 additions and 83 deletions

View File

@@ -2402,6 +2402,9 @@ void CdbEngine::handleExtensionMessage(char t, int token, const QByteArray &what
GdbMi gdbmi;
gdbmi.fromString(message);
exception.fromGdbMI(gdbmi);
// Don't show the Win32 x86 emulation subsystem breakpoint hit exception.
if (exception.exceptionCode == winExceptionWX86Breakpoint)
return;
const QString message = exception.toString(true);
showStatusMessage(message);
// Report C++ exception in application output as well.