summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2019-04-17 08:38:20 +0200
committerUlf Hermann <ulf.hermann@qt.io>2019-04-18 13:16:03 +0000
commitc018df5b4075ae962966d4df7653d476dab02840 (patch)
tree59830a1ad58e81593f3e201e95e8c0708d63506c /tests
parentea74f0c68cddf706c950d3910cf7b363fe24885b (diff)
QML: Remove static attchedPropertyIds map
If the same object is available under two different names it should still have the same attached properties no matter which name you use. This was achieved by having a static map of metaobjects to attached property IDs that would always hold the first attached property ID registered for a given metaobject. This attached property ID was then used as key in the map of attached properties for the actual objects. The obvious downside to that is that we need a global static which gives us thread safety and static initialization (and destruction) problems. It turns out, all the attached properties are created by attached properties functions, registered by the user. Those functions only get the object to be amended as parameter. Therefore, no attached properties function can be registered for multiple attached properties on the same object as it wouldn't know which one to create for a given call. Thus, the whole ID dance is unnecessary as we can as well index the attached property objects by the function that created them. This nicely avoids creating two attached property objects for the same object and function and still makes the global static unnecessary. Fixes: QTBUG-75176 Change-Id: Ie8d53ef0a6f41c9b3d6b9d611cde1603a557901c Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp b/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp
index 7f103dc5ed..a7805922a5 100644
--- a/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp
+++ b/tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp
@@ -550,8 +550,8 @@ void tst_qqmlmetatype::unregisterAttachedProperties()
c.setData("import QtQuick 2.2\n Item { }", dummy);
const QQmlType attachedType = QQmlMetaType::qmlType("QtQuick/KeyNavigation", 2, 2);
- QCOMPARE(attachedType.attachedPropertiesId(QQmlEnginePrivate::get(&e)),
- attachedType.index());
+ QCOMPARE(attachedType.attachedPropertiesType(QQmlEnginePrivate::get(&e)),
+ attachedType.metaObject());
QVERIFY(c.create());
}
@@ -569,8 +569,8 @@ void tst_qqmlmetatype::unregisterAttachedProperties()
"Item { KeyNavigation.up: null }", dummy);
const QQmlType attachedType = QQmlMetaType::qmlType("QtQuick/KeyNavigation", 2, 2);
- QCOMPARE(attachedType.attachedPropertiesId(QQmlEnginePrivate::get(&e)),
- attachedType.index());
+ QCOMPARE(attachedType.attachedPropertiesType(QQmlEnginePrivate::get(&e)),
+ attachedType.metaObject());
QVERIFY(c.create());
}