Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

2 files changed, 9 insertions, 8 deletions

diff --git a/src/declarative/util/qmlopenmetaobject.cpp b/src/declarative/util/qmlopenmetaobject.cpp
index e66a3e7..373be2d 100644
--- a/src/declarative/util/qmlopenmetaobject.cpp
+++ b/src/declarative/util/qmlopenmetaobject.cpp
@@ -76,6 +76,8 @@ QmlOpenMetaObjectType::~QmlOpenMetaObjectType()
 {
     if (d->mem)
         qFree(d->mem);
+    if (d->cache)
+        d->cache->release();
     delete d;
 }
 
diff --git a/src/declarative/util/qmlstate_p_p.h b/src/declarative/util/qmlstate_p_p.h
index ee08949..04c5264 100644
--- a/src/declarative/util/qmlstate_p_p.h
+++ b/src/declarative/util/qmlstate_p_p.h
@@ -116,16 +116,15 @@ public:
         }
     };
 
-    typedef QList<OperationGuard> GuardedOpList;
-    class OperationList : public GuardedOpList, public QmlList<QmlStateOperation*>
+    class OperationList : public QList<OperationGuard>, public QmlList<QmlStateOperation*>
     {
     public:
-        virtual void append(QmlStateOperation* v) { GuardedOpList::append(OperationGuard(v, this)); }
-        virtual void insert(int i, QmlStateOperation* v) { GuardedOpList::insert(i, OperationGuard(v, this)); }
-        virtual void clear() { GuardedOpList::clear(); }
-        virtual QmlStateOperation* at(int i) const { return GuardedOpList::at(i); }
-        virtual void removeAt(int i) { GuardedOpList::removeAt(i); }
-        virtual int count() const { return GuardedOpList::count(); }
+        virtual void append(QmlStateOperation* v) { QList<OperationGuard>::append(OperationGuard(v, this)); }
+        virtual void insert(int i, QmlStateOperation* v) { QList<OperationGuard>::insert(i, OperationGuard(v, this)); }
+        virtual void clear() { QList<OperationGuard>::clear(); }
+        virtual QmlStateOperation* at(int i) const { return QList<OperationGuard>::at(i); }
+        virtual void removeAt(int i) { QList<OperationGuard>::removeAt(i); }
+        virtual int count() const { return QList<OperationGuard>::count(); }
     };
     OperationList operations;