diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 88454812f50b2348966e0f80773e48660825c668..1fd3adfef8579b0d670c4bdc4e3a6ab143c1d027 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 ff706a13bf62ddf3af91971b8671b5ebea09ee7f..7b70b5845d325c4e94ceefbe6cd820ca6917666c 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)