Merge remote-tracking branch 'origin/3.6'

Change-Id: I8223551aec66539dd8c55262e5000c1621410334
2015-12-15 12:21:49 +01:00
parent 75cfa50771 aa6fb0da41
commit ff60bf37c9
54 changed files with 3096 additions and 883 deletions
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1311,7 +1311,8 @@ void GdbEngine::handleStopResponse(const GdbMi &data)
 {
    // Ignore trap on Windows terminals, which results in
    // spurious "* stopped" message.
-    if (!data.isValid() && m_terminalTrap && Abi::hostAbi().os() == Abi::WindowsOS) {
+    if (m_terminalTrap && (!data.isValid() || !data["reason"].isValid())
+            && Abi::hostAbi().os() == Abi::WindowsOS) {
        m_terminalTrap = false;
        showMessage(_("IGNORING TERMINAL SIGTRAP"), LogMisc);
        return;