diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-07-05 13:29:57 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-05 15:02:58 +0200 |
commit | 5d6f8b18fe77d2fc17a3c1d77d1c4baeff0e9704 (patch) | |
tree | 507f652c897825a7f6b3a09a5dd2c09d6c1797f4 /src/qml/qml/qqmllistwrapper_p.h | |
parent | 2e4d1ccb18aba13f94670d3d1104839fecf2ab5c (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/qqmllistwrapper_p.h')
-rw-r--r-- | src/qml/qml/qqmllistwrapper_p.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/qml/qqmllistwrapper_p.h b/src/qml/qml/qqmllistwrapper_p.h index 83624d1423..c87b9b22d5 100644 --- a/src/qml/qml/qqmllistwrapper_p.h +++ b/src/qml/qml/qqmllistwrapper_p.h @@ -54,8 +54,9 @@ // #include <QtCore/qglobal.h> +#include <QtCore/qpointer.h> + #include <QtQml/qqmllist.h> -#include <private/qqmlguard_p.h> #include <private/qv4value_p.h> #include <private/qv4object_p.h> @@ -88,7 +89,7 @@ public: private: QV8Engine *v8; - QQmlGuard<QObject> object; + QPointer<QObject> object; QQmlListProperty<QObject> property; int propertyType; |