diff options
| -rw-r--r-- | tests/auto/qml/qml.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlpropertycache/tst_qqmlpropertycache.cpp | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro index 2c5d367b88..e24e30d2f9 100644 --- a/tests/auto/qml/qml.pro +++ b/tests/auto/qml/qml.pro @@ -35,6 +35,7 @@ PRIVATETESTS += \ qqmlinstruction \ qqmllanguage \ qqmlproperty \ + qqmlpropertycache \ qqmlpropertymap \ qqmlsqldatabase \ qqmlvaluetypes \ diff --git a/tests/auto/qml/qqmlpropertycache/tst_qqmlpropertycache.cpp b/tests/auto/qml/qqmlpropertycache/tst_qqmlpropertycache.cpp index b702623fee..de3c0412fb 100644 --- a/tests/auto/qml/qqmlpropertycache/tst_qqmlpropertycache.cpp +++ b/tests/auto/qml/qqmlpropertycache/tst_qqmlpropertycache.cpp @@ -131,8 +131,7 @@ void tst_qqmlpropertycache::propertiesDerived() const QMetaObject *metaObject = object.metaObject(); QQmlRefPointer<QQmlPropertyCache> parentCache(new QQmlPropertyCache(&engine, &BaseObject::staticMetaObject)); - QQmlRefPointer<QQmlPropertyCache> cache(parentCache->copy()); - cache->append(&engine, object.metaObject()); + QQmlRefPointer<QQmlPropertyCache> cache(parentCache->copyAndAppend(&engine, object.metaObject())); QQmlPropertyData *data; QVERIFY(data = cache->property(QLatin1String("propertyA"))); @@ -189,8 +188,7 @@ void tst_qqmlpropertycache::methodsDerived() const QMetaObject *metaObject = object.metaObject(); QQmlRefPointer<QQmlPropertyCache> parentCache(new QQmlPropertyCache(&engine, &BaseObject::staticMetaObject)); - QQmlRefPointer<QQmlPropertyCache> cache(parentCache->copy()); - cache->append(&engine, object.metaObject()); + QQmlRefPointer<QQmlPropertyCache> cache(parentCache->copyAndAppend(&engine, object.metaObject())); QQmlPropertyData *data; QVERIFY(data = cache->property(QLatin1String("slotA"))); @@ -253,8 +251,7 @@ void tst_qqmlpropertycache::signalHandlersDerived() const QMetaObject *metaObject = object.metaObject(); QQmlRefPointer<QQmlPropertyCache> parentCache(new QQmlPropertyCache(&engine, &BaseObject::staticMetaObject)); - QQmlRefPointer<QQmlPropertyCache> cache(parentCache->copy()); - cache->append(&engine, object.metaObject()); + QQmlRefPointer<QQmlPropertyCache> cache(parentCache->copyAndAppend(&engine, object.metaObject())); QQmlPropertyData *data; QVERIFY(data = cache->property(QLatin1String("onSignalA"))); |