Stop using QGuard

This should allow QGuard to be removed from Qt and QObjectPrivate::ExtraData.
Having QmlGuard inside QmlDeclarativeData reduces the number of new's, and
creating QmlDeclarativeData is faster than QObjectPrivate::ExtraData anyway.

1 files changed, 2 insertions, 1 deletions

diff --git a/src/declarative/qml/qmlmetaproperty_p.h b/src/declarative/qml/qmlmetaproperty_p.h
index b4d72bb..97b5208 100644
--- a/src/declarative/qml/qmlmetaproperty_p.h
+++ b/src/declarative/qml/qmlmetaproperty_p.h
@@ -56,6 +56,7 @@
 #include "qmlmetaproperty.h"
 
 #include "qmlpropertycache_p.h"
+#include "qmlguard_p.h"
 
 #include <private/qobject_p.h>
 
@@ -77,7 +78,7 @@ public:
 
     QmlMetaProperty *q;
     QmlContext *context;
-    QGuard<QObject> object;
+    QmlGuard<QObject> object;
 
     bool isDefaultProperty:1;
     bool isNameCached:1;