From 5d6f8b18fe77d2fc17a3c1d77d1c4baeff0e9704 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@digia.com>
Date: Fri, 5 Jul 2013 13:29:57 +0200
Subject: Get rid of the first half of QQmlGuard usage

QQmlGuard was being used as a more performant replacement
for QPointer. QPointer got now fixed in Qt 5.0, making this
class obsolete.

Change-Id: I77eef066c4823af4b074ef32d4d78dbd67c36cd0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---
 src/qml/qml/qqmllist_p.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/qml/qml/qqmllist_p.h')

diff --git a/src/qml/qml/qqmllist_p.h b/src/qml/qml/qqmllist_p.h
index a39730049d..48732223dd 100644
--- a/src/qml/qml/qqmllist_p.h
+++ b/src/qml/qml/qqmllist_p.h
@@ -54,7 +54,6 @@
 //
 
 #include "qqmllist.h"
-#include "qqmlguard_p.h"
 #include "qqmlpropertycache_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -66,7 +65,7 @@ public:
 
     static QQmlListReference init(const QQmlListProperty<QObject> &, int, QQmlEngine *);
 
-    QQmlGuard<QObject> object;
+    QPointer<QObject> object;
     QQmlMetaObject elementType;
     QQmlListProperty<QObject> property;
     int propertyType;
-- 
cgit v1.2.3