diff options
| -rw-r--r-- | src/qml/qml/qqmlpropertycache.cpp | 9 | ||||
| -rw-r--r-- | src/qml/qml/qqmlpropertycache_p.h | 4 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlpropertycache/tst_qqmlpropertycache.cpp | 6 |
3 files changed, 3 insertions, 16 deletions
diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index 71d67272d9..f2c1027990 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -380,15 +380,6 @@ void QQmlPropertyCache::setParent(QQmlPropertyCache *newParent) QQmlPropertyCache * QQmlPropertyCache::copyAndAppend(const QMetaObject *metaObject, - QQmlPropertyData::Flags propertyFlags, - QQmlPropertyData::Flags methodFlags, - QQmlPropertyData::Flags signalFlags) -{ - return copyAndAppend(metaObject, QTypeRevision(), propertyFlags, methodFlags, signalFlags); -} - -QQmlPropertyCache * -QQmlPropertyCache::copyAndAppend(const QMetaObject *metaObject, QTypeRevision typeVersion, QQmlPropertyData::Flags propertyFlags, QQmlPropertyData::Flags methodFlags, diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h index b265d339e8..e179123026 100644 --- a/src/qml/qml/qqmlpropertycache_p.h +++ b/src/qml/qml/qqmlpropertycache_p.h @@ -138,10 +138,6 @@ public: QQmlPropertyCache *copy(); - QQmlPropertyCache *copyAndAppend(const QMetaObject *, - QQmlPropertyData::Flags propertyFlags = QQmlPropertyData::Flags(), - QQmlPropertyData::Flags methodFlags = QQmlPropertyData::Flags(), - QQmlPropertyData::Flags signalFlags = QQmlPropertyData::Flags()); QQmlPropertyCache *copyAndAppend( const QMetaObject *, QTypeRevision typeVersion, QQmlPropertyData::Flags propertyFlags = QQmlPropertyData::Flags(), diff --git a/tests/auto/qml/qqmlpropertycache/tst_qqmlpropertycache.cpp b/tests/auto/qml/qqmlpropertycache/tst_qqmlpropertycache.cpp index a4c8da1da2..875a174814 100644 --- a/tests/auto/qml/qqmlpropertycache/tst_qqmlpropertycache.cpp +++ b/tests/auto/qml/qqmlpropertycache/tst_qqmlpropertycache.cpp @@ -221,7 +221,7 @@ void tst_qqmlpropertycache::propertiesDerived() QQmlRefPointer<QQmlPropertyCache> parentCache( new QQmlPropertyCache(&BaseObject::staticMetaObject), QQmlRefPointer<QQmlPropertyCache>::Adopt); - QQmlRefPointer<QQmlPropertyCache> cache(parentCache->copyAndAppend(object.metaObject()), + QQmlRefPointer<QQmlPropertyCache> cache(parentCache->copyAndAppend(object.metaObject(), QTypeRevision()), QQmlRefPointer<QQmlPropertyCache>::Adopt); QQmlPropertyData *data; @@ -302,7 +302,7 @@ void tst_qqmlpropertycache::methodsDerived() QQmlRefPointer<QQmlPropertyCache> parentCache( new QQmlPropertyCache(&BaseObject::staticMetaObject), QQmlRefPointer<QQmlPropertyCache>::Adopt); - QQmlRefPointer<QQmlPropertyCache> cache(parentCache->copyAndAppend(object.metaObject()), + QQmlRefPointer<QQmlPropertyCache> cache(parentCache->copyAndAppend(object.metaObject(), QTypeRevision {}), QQmlRefPointer<QQmlPropertyCache>::Adopt); QQmlPropertyData *data; @@ -369,7 +369,7 @@ void tst_qqmlpropertycache::signalHandlersDerived() QQmlRefPointer<QQmlPropertyCache> parentCache( new QQmlPropertyCache(&BaseObject::staticMetaObject), QQmlRefPointer<QQmlPropertyCache>::Adopt); - QQmlRefPointer<QQmlPropertyCache> cache(parentCache->copyAndAppend(object.metaObject()), + QQmlRefPointer<QQmlPropertyCache> cache(parentCache->copyAndAppend(object.metaObject(), QTypeRevision{}), QQmlRefPointer<QQmlPropertyCache>::Adopt); QQmlPropertyData *data; |