rv.type = QQmlObjectProperty::Object;
} else if (QQmlMetaType::isList(prop.userType())) {
rv.type = QQmlObjectProperty::List;
+ } else if (prop.userType() == QMetaType::QVariant) {
+ rv.type = QQmlObjectProperty::Variant;
}
QVariant value;
};
struct QQmlObjectProperty {
- enum Type { Unknown, Basic, Object, List, SignalProperty };
+ enum Type { Unknown, Basic, Object, List, SignalProperty, Variant };
Type type;
QString name;
QVariant value;
"property variant varObj\n"
"property variant varObjList: []\n"
"property variant varObjMap\n"
+ "property variant simpleVar: 10.05\n"
"Component.onCompleted: {\n"
"varObj = blueRect;\n"
"var list = varObjList;\n"
QVariantMap map;
map.insert(QLatin1String("rect"), QVariant(QLatin1String("<unnamed object>")));
QTest::newRow("varObjMap") << "varObjMap" << qVariantFromValue(map);
+ QTest::newRow("simpleVar") << "simpleVar" << qVariantFromValue(10.05);
}
void tst_QQmlEngineDebugService::queryExpressionResultInRootContext()
QVariantMap map;
map.insert(QLatin1String("rect"), QVariant(QLatin1String("<unnamed object>")));
QTest::newRow("varObjMap") << "varObjMap" << qVariantFromValue(map);
+ QTest::newRow("simpleVar") << "simpleVar" << qVariantFromValue(10.05);
}
void tst_QQmlEngineDebugService::setBindingForObject()