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/quick/items/qquickflipable.cpp | |
| 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/quick/items/qquickflipable.cpp')
| -rw-r--r-- | src/quick/items/qquickflipable.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/quick/items/qquickflipable.cpp b/src/quick/items/qquickflipable.cpp index 1ede6b0ea9..3428c66a62 100644 --- a/src/quick/items/qquickflipable.cpp +++ b/src/quick/items/qquickflipable.cpp @@ -42,7 +42,6 @@ #include "qquickflipable_p.h" #include "qquickitem_p.h" -#include <private/qqmlguard_p.h> #include <QtQml/qqmlinfo.h> @@ -78,9 +77,9 @@ public: void setBackTransform(); QQuickFlipable::Side current; - QQmlGuard<QQuickLocalTransform> backTransform; - QQmlGuard<QQuickItem> front; - QQmlGuard<QQuickItem> back; + QPointer<QQuickLocalTransform> backTransform; + QPointer<QQuickItem> front; + QPointer<QQuickItem> back; bool sideDirty; bool wantBackXFlipped; |