From da76dcc32f0dfdd1dfea756a6b64ef8279c78b36 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 28 Aug 2009 16:11:28 +0200 Subject: [PATCH] debugger: the new pointer checks had been to aggressive. disable for now --- share/qtcreator/gdbmacros/gdbmacros.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/share/qtcreator/gdbmacros/gdbmacros.cpp b/share/qtcreator/gdbmacros/gdbmacros.cpp index ab84fed5f80..d045bf3a969 100644 --- a/share/qtcreator/gdbmacros/gdbmacros.cpp +++ b/share/qtcreator/gdbmacros/gdbmacros.cpp @@ -275,9 +275,11 @@ static bool couldBePointer(const void *p) { // we assume valid pointer to be 4-aligned at least. // So use this check only when this is guaranteed. + // FIXME: this breaks e.g. in the QString dumper... const quintptr d = quintptr(p); - qDebug() << "CHECKING : " << p << ((d & 3) == 0 && (d > 1000 || d == 0)); - return (d & 3) == 0 && (d > 1000 || d == 0); + //qDebug() << "CHECKING : " << p << ((d & 3) == 0 && (d > 1000 || d == 0)); + //return (d & 3) == 0 && (d > 1000 || d == 0); + return d > 1000 || d == 0; } // Check memory for read access and provoke segfault if nothing else helps. @@ -870,7 +872,7 @@ void QDumper::putHash(const char *name, QChar value) endHash(); } -#define DUMPUNKNOWN_MESSAGE "" +#define DUMPUNKNOWN_MESSAGE "" static void qDumpUnknown(QDumper &d, const char *why = 0) { //d.putItem("iname", d.iname);