Convert QQmlPropertyCache to use QV4::persistentValue instead of the v8 version

The V4 persistent values are safer to use, as the v8 ones never
implemented proper semantics when the engine gets deleted.

Change-Id: I787f8c01c70828f22ac60f0ac25201cdfa5a617f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 3 insertions, 4 deletions

diff --git a/src/qml/qml/qqmlpropertycache.cpp b/src/qml/qml/qqmlpropertycache.cpp
index dee534dc69..c2ad069391 100644
--- a/src/qml/qml/qqmlpropertycache.cpp
+++ b/src/qml/qml/qqmlpropertycache.cpp
@@ -290,8 +290,8 @@ QQmlPropertyCache::~QQmlPropertyCache()
 
 void QQmlPropertyCache::destroy()
 {
-    Q_ASSERT(engine || constructor.IsEmpty());
-    if (constructor.IsEmpty())
+    Q_ASSERT(engine || constructor->isDeleted());
+    if (constructor->isDeleted())
         delete this;
     else
         QQmlEnginePrivate::deleteInEngineThread(engine, this);
@@ -301,7 +301,6 @@ void QQmlPropertyCache::destroy()
 // that are tied to the specific QQmlEngine.
 void QQmlPropertyCache::clear()
 {
-    qPersistentDispose(constructor);
     engine = 0;
 }
 
@@ -599,7 +598,7 @@ 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
+    Q_ASSERT(constructor->isDeleted()); // We should not be appending to an in-use property cache
 
     _metaObject = metaObject;