Ensure cleanup happens before the destruction of QScriptEngine

This was causing crashes on windows.

1 files changed, 12 insertions, 2 deletions

diff --git a/src/declarative/qml/qmlpropertycache.cpp b/src/declarative/qml/qmlpropertycache.cpp
index e00126f..3ede341 100644
--- a/src/declarative/qml/qmlpropertycache.cpp
+++ b/src/declarative/qml/qmlpropertycache.cpp
@@ -86,12 +86,18 @@ void QmlPropertyCache::Data::load(const QMetaMethod &m)
 }
 
 
-QmlPropertyCache::QmlPropertyCache()
+QmlPropertyCache::QmlPropertyCache(QmlEngine *engine)
+: QmlCleanup(engine)
 {
 }
 
 QmlPropertyCache::~QmlPropertyCache()
 {
+    clear();
+}
+
+void QmlPropertyCache::clear()
+{
     for (int ii = 0; ii < indexCache.count(); ++ii) 
         indexCache.at(ii)->release();
 
@@ -102,6 +108,10 @@ QmlPropertyCache::~QmlPropertyCache()
     for (IdentifierCache::ConstIterator iter = identifierCache.begin(); 
             iter != identifierCache.end(); ++iter)
         (*iter)->release();
+
+    indexCache.clear();
+    stringCache.clear();
+    identifierCache.clear();
 }
 
 QmlPropertyCache::Data QmlPropertyCache::create(const QMetaObject *metaObject, 
@@ -141,7 +151,7 @@ QmlPropertyCache *QmlPropertyCache::create(QmlEngine *engine, const QMetaObject
     Q_ASSERT(engine);
     Q_ASSERT(metaObject);
 
-    QmlPropertyCache *cache = new QmlPropertyCache;
+    QmlPropertyCache *cache = new QmlPropertyCache(engine);
 
     QmlEnginePrivate *enginePriv = QmlEnginePrivate::get(engine);