aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlvme_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-07-05 13:29:57 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-05 15:02:58 +0200
commit5d6f8b18fe77d2fc17a3c1d77d1c4baeff0e9704 (patch)
tree507f652c897825a7f6b3a09a5dd2c09d6c1797f4 /src/qml/qml/qqmlvme_p.h
parent2e4d1ccb18aba13f94670d3d1104839fecf2ab5c (diff)
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>
Diffstat (limited to 'src/qml/qml/qqmlvme_p.h')
-rw-r--r--src/qml/qml/qqmlvme_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlvme_p.h b/src/qml/qml/qqmlvme_p.h
index 750076f277..09e3237aee 100644
--- a/src/qml/qml/qqmlvme_p.h
+++ b/src/qml/qml/qqmlvme_p.h
@@ -202,7 +202,7 @@ public:
private:
int m_objectCount;
- QQmlGuard<QObject> *m_objects;
+ QPointer<QObject> *m_objects;
int m_contextCount;
QQmlGuardedContextData *m_contexts;
};