diff options
Diffstat (limited to 'src/qml/qml/qqmlpropertycache.cpp')
| -rw-r--r-- | src/qml/qml/qqmlpropertycache.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp index 65406c9391..d047de7e0e 100644 --- a/src/qml/qml/qqmlpropertycache.cpp +++ b/src/qml/qml/qqmlpropertycache.cpp @@ -290,11 +290,8 @@ QQmlPropertyCache::~QQmlPropertyCache() void QQmlPropertyCache::destroy() { - Q_ASSERT(engine || constructor.isEmpty()); - if (constructor.isEmpty()) - delete this; - else - QQmlEnginePrivate::deleteInEngineThread(engine, this); + Q_ASSERT(engine); + delete this; } // This is inherited from QQmlCleanup, so it should only clear the things @@ -317,8 +314,6 @@ QQmlPropertyCache *QQmlPropertyCache::copy(int reserve) cache->_metaObject = _metaObject; cache->_defaultPropertyName = _defaultPropertyName; - // We specifically do *NOT* copy the constructor - return cache; } @@ -547,11 +542,6 @@ QQmlPropertyCache *QQmlPropertyCache::parent() const return _parent; } -void QQmlPropertyCache::setParent(QQmlPropertyCache *newParent) -{ - _parent = newParent; -} - // Returns the first C++ type's QMetaObject - that is, the first QMetaObject not created by // QML const QMetaObject *QQmlPropertyCache::firstCppMetaObject() const @@ -598,7 +588,6 @@ void QQmlPropertyCache::append(QQmlEngine *engine, const QMetaObject *metaObject QQmlPropertyData::Flag signalFlags) { Q_UNUSED(revision); - Q_ASSERT(constructor.isEmpty()); // We should not be appending to an in-use property cache _metaObject = metaObject; |