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/qqmlproperty_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/qqmlproperty_p.h')
| -rw-r--r-- | src/qml/qml/qqmlproperty_p.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlproperty_p.h b/src/qml/qml/qqmlproperty_p.h index 6482432a20..9af091ad46 100644 --- a/src/qml/qml/qqmlproperty_p.h +++ b/src/qml/qml/qqmlproperty_p.h @@ -59,7 +59,6 @@ #include <private/qobject_p.h> #include <private/qtqmlglobal_p.h> #include <private/qqmlpropertycache_p.h> -#include <private/qqmlguard_p.h> #include <private/qqmlboundsignalexpressionpointer_p.h> QT_BEGIN_NAMESPACE @@ -78,8 +77,8 @@ public: Q_DECLARE_FLAGS(WriteFlags, WriteFlag) QQmlContextData *context; - QQmlGuard<QQmlEngine> engine; - QQmlGuard<QObject> object; + QPointer<QQmlEngine> engine; + QPointer<QObject> object; QQmlPropertyData core; |