Merge commit 'df16699ed9958584bb53e8790ccbcdc1e4b42dbb'

Conflicts:
	src/plugins/debugger/procinterrupt.cpp

share/qtcreator/gdbmacros/gdbmacros.cpp

@@ -68,6 +68,7 @@ int qtGhVersion = QT_VERSION;
 
 #include <ctype.h>
 #include <stdio.h>
+#include <unistd.h>
 
 #ifdef Q_OS_WIN
 #   include <windows.h>
@@ -2484,6 +2485,7 @@ void qDumpObjectData440(
     int extraInt2,
     int extraInt3)
 {
+    //sleep(20);
     if (protocolVersion == 1) {
         QDumper d;
         d.protocolVersion = protocolVersion;

src/plugins/debugger/procinterrupt.cpp

@@ -177,8 +177,7 @@ bool Debugger::Internal::interruptProcess(int pID)
 {
     int procId = pID;
     if (procId != -1) {
-        // used SIGINT previously
-        if (kill(procId, SIGTRAP) == 0)
+        if (kill(procId, SIGINT) == 0)
             return true;
     }
     return false;