debugger: make format for all integer types selectable

1 files changed, 10 insertions, 3 deletions

diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index 6933b68ff8e..0263ca51a83 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -305,18 +305,25 @@ QString extractTypeFromPTypeOutput(const QString &str)
     return res.simplified();
 }
 
-bool isIntOrFloatType(const QString &type)
+bool isIntType(const QString &type)
 {
     static const QStringList types = QStringList()
         << QLatin1String("char") << QLatin1String("int") << QLatin1String("short")
-        << QLatin1String("float") << QLatin1String("double") << QLatin1String("long")
-        << QLatin1String("bool") << QLatin1String("signed char") << QLatin1String("unsigned")
+        << QLatin1String("long") << QLatin1String("bool")
+        << QLatin1String("signed char") << QLatin1String("unsigned")
         << QLatin1String("unsigned char")
         << QLatin1String("unsigned int") << QLatin1String("unsigned long")
         << QLatin1String("long long")  << QLatin1String("unsigned long long");
     return types.contains(type);
 }
 
+bool isIntOrFloatType(const QString &type)
+{
+    static const QStringList types = QStringList()
+        << QLatin1String("float") << QLatin1String("double");
+    return isIntType(type) || types.contains(type);
+}
+
 QString sizeofTypeExpression(const QString &type)
 {
     if (type.endsWith(QLatin1Char('*')))