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

Merge commit 'df16699ed9958584bb53e8790ccbcdc1e4b42dbb'

Browse Source 
Conflicts:
	src/plugins/debugger/procinterrupt.cpp
This commit is contained in:
hjk
2009-02-11 14:44:06 +01:00
parent 96e489a3ec df16699ed9
commit 5130e2030f
3 changed files with 98 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/gdbmacros/gdbmacros.cpp
View File

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

3
src/plugins/debugger/procinterrupt.cpp
View File

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