QQmlEngineDebugService: Avoid assert when debugging QModelIndex

QModelIndex is not streamable, so returning the input QVariant in
valueContents() will result in an assert.

We try to detect whether the input QVariant is a know value type
and then call the toString() meta-method on it. Otherwise, we fall
back to thge old behavior. This works since QModelIndex is exposed
to QML wrapped in an internal value type class (at least for the
time being).

Change-Id: I1a4c61b2bd441f823469dd73b31e86a1192f02e6
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>

1 files changed, 15 insertions, 1 deletions

diff --git a/src/qml/debugger/qqmlenginedebugservice.cpp b/src/qml/debugger/qqmlenginedebugservice.cpp
index 088f3203d6..a8c1af73cb 100644
--- a/src/qml/debugger/qqmlenginedebugservice.cpp
+++ b/src/qml/debugger/qqmlenginedebugservice.cpp
@@ -207,8 +207,22 @@ QVariant QQmlEngineDebugService::valueContents(QVariant value) const
         return contents;
     }
 
-    if (QQmlValueTypeFactory::isValueType(userType))
+    if (QQmlValueTypeFactory::isValueType(userType)) {
+        const QMetaObject *mo = QQmlValueTypeFactory::metaObjectForMetaType(userType);
+        if (mo) {
+            int toStringIndex = mo->indexOfMethod("toString");
+            if (toStringIndex != -1) {
+                QMetaMethod mm = mo->method(toStringIndex);
+                QMetaType info(userType);
+                QString s;
+                if (info.flags() & QMetaType::IsGadget
+                        && mm.invokeOnGadget(value.data(), Q_RETURN_ARG(QString, s)))
+                    return s;
+            }
+        }
+
         return value;
+    }
 
     if (QQmlMetaType::isQObject(userType)) {
         QObject *o = QQmlMetaType::toQObject(value);