From 33271f0be77dab26b00efd04f8612b09e4e70c7e Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 16 Sep 2009 12:20:16 +0200
Subject: [PATCH] debugger: disable some debug output again; also make more
type known as 'simple integral'
---
src/plugins/debugger/gdb/gdbengine.cpp | 2 +-
src/plugins/debugger/watchutils.cpp | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 88454812f50..1fd3adfef85 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -85,7 +85,7 @@ namespace Internal {
using namespace Debugger::Constants;
//#define DEBUG_PENDING 1
-#define DEBUG_SUBITEM 1
+//#define DEBUG_SUBITEM 1
#if DEBUG_PENDING
# define PENDING_DEBUG(s) qDebug() << s
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index ff706a13bf6..7b70b5845d3 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -333,10 +333,9 @@ bool isIntType(const QString &type)
<< QLatin1String("char") << QLatin1String("int") << QLatin1String("short")
<< QLatin1String("long") << QLatin1String("bool")
<< QLatin1String("signed char") << QLatin1String("unsigned")
- << QLatin1String("unsigned char")
- << QLatin1String("unsigned int") << QLatin1String("unsigned long")
+ << QLatin1String("unsigned char") << QLatin1String("unsigned long")
<< QLatin1String("long long") << QLatin1String("unsigned long long");
- return types.contains(type);
+ return type.endsWith(QLatin1String(" int")) || types.contains(type);
}
bool isSymbianIntType(const QString &type)
--
GitLab