qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QQmlPropertyCache: Avoid costly string comparison 

The qqmlecmacsript required changes, because the call to id makes the
type now known to the QML engine.

Change-Id: I73aed804ae8769c71676b44d8450e1dabf5baa6d
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Fabian Kosmale 2020-03-05 14:16:37 +01:00
parent 2757f8e0e1
commit df6d816fe3
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qml/qml/qqmlpropertycache.cpp
View File

@ -661,7 +661,7 @@ void QQmlPropertyCache::resolve(QQmlPropertyData *data) const
data->setPropType(QMetaType::type(retTy));
} else {
auto metaProperty = mo->property(data->coreIndex());
data->setPropType(QMetaType::type(metaProperty.typeName()));
data->setPropType(metaProperty.metaType().id());
}
if (!data->isFunction()) {

18
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
View File

@ -1273,44 +1273,36 @@ void tst_qqmlecmascript::enums()
// Non-existent enums
{
QUrl file = testFileUrl("enums.2.qml");
QString w1 = QLatin1String("QMetaProperty::read: Unable to handle unregistered datatype 'MyEnum' for property 'MyUnregisteredEnumTypeObject::enumProperty'");
QString w2 = QLatin1String("QQmlExpression: Expression ") + testFileUrl("enums.2.qml").toString() + QLatin1String(":9:5 depends on non-NOTIFYable properties:");
QString w3 = QLatin1String(" MyUnregisteredEnumTypeObject::enumProperty");
QString w4 = file.toString() + ":7:5: Unable to assign [undefined] to int";
QString w5 = file.toString() + ":8:5: Unable to assign [undefined] to int";
QString w6 = file.toString() + ":9:5: Unable to assign [undefined] to int";
QString w7 = file.toString() + ":13:9: Unable to assign [undefined] to [unknown property type]";
QString w8 = file.toString() + ":31:9: Unable to assign int to [unknown property type]";
QTest::ignoreMessage(QtWarningMsg, qPrintable(w1));
QString w7 = file.toString() + ":13:9: Unable to assign [undefined] to MyUnregisteredEnumTypeObject::MyEnum";
QTest::ignoreMessage(QtWarningMsg, qPrintable(w2));
QTest::ignoreMessage(QtWarningMsg, qPrintable(w3));
QTest::ignoreMessage(QtWarningMsg, qPrintable(w4));
QTest::ignoreMessage(QtWarningMsg, qPrintable(w5));
QTest::ignoreMessage(QtWarningMsg, qPrintable(w6));
QTest::ignoreMessage(QtWarningMsg, qPrintable(w7));
QTest::ignoreMessage(QtWarningMsg, qPrintable(w8));
QQmlComponent component(&engine, testFileUrl("enums.2.qml"));
QObject *object = component.create();
QVERIFY(object != nullptr);
QCOMPARE(object->property("a").toInt(), 0);
QCOMPARE(object->property("b").toInt(), 0);
QCOMPARE(object->property("c").toInt(), 0);
QCOMPARE(object->property("c").toInt(), 1); // Change from Qt 5: type gets automatically registered
QString w9 = file.toString() + ":18: Error: Cannot assign JavaScript function to [unknown property type]";
QString w9 = file.toString() + ":18: Error: Cannot assign JavaScript function to MyUnregisteredEnumTypeObject::MyEnum";
QTest::ignoreMessage(QtWarningMsg, qPrintable(w9));
QMetaObject::invokeMethod(object, "testAssignmentOne");
QString w10 = file.toString() + ":21: Error: Cannot assign [undefined] to [unknown property type]";
QString w10 = file.toString() + ":21: Error: Cannot assign [undefined] to MyUnregisteredEnumTypeObject::MyEnum";
QTest::ignoreMessage(QtWarningMsg, qPrintable(w10));
QMetaObject::invokeMethod(object, "testAssignmentTwo");
QString w11 = file.toString() + ":24: Error: Cannot assign [undefined] to [unknown property type]";
QString w11 = file.toString() + ":24: Error: Cannot assign [undefined] to MyUnregisteredEnumTypeObject::MyEnum";
QTest::ignoreMessage(QtWarningMsg, qPrintable(w11));
QMetaObject::invokeMethod(object, "testAssignmentThree");
QString w12 = file.toString() + ":34: Error: Cannot assign int to an unregistered type";
QTest::ignoreMessage(QtWarningMsg, qPrintable(w12));
QMetaObject::invokeMethod(object, "testAssignmentFour");
delete object;