1 files changed, 5 insertions, 4 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
index d19e5a5..1fa08bb 100644
--- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
@@ -42,6 +42,7 @@
 #include "qdeclarativeflipable_p.h"
 
 #include "qdeclarativeitem_p.h"
+#include "qdeclarativeguard_p.h"
 
 #include <qdeclarativeinfo.h>
 
@@ -58,8 +59,8 @@ public:
     void updateSceneTransformFromParent();
 
     QDeclarativeFlipable::Side current;
-    QDeclarativeItem *front;
-    QDeclarativeItem *back;
+    QDeclarativeGuard<QDeclarativeItem> front;
+    QDeclarativeGuard<QDeclarativeItem> back;
 };
 
 /*!
@@ -159,7 +160,7 @@ QDeclarativeFlipable::Side QDeclarativeFlipable::side() const
 {
     Q_D(const QDeclarativeFlipable);
     if (d->dirtySceneTransform)
-        const_cast<QDeclarativeFlipablePrivate *>(d)->updateSceneTransformFromParent();
+        const_cast<QDeclarativeFlipablePrivate *>(d)->ensureSceneTransform();
 
     return d->current;
 }
@@ -192,7 +193,7 @@ void QDeclarativeFlipablePrivate::updateSceneTransformFromParent()
 
     if (newSide != current) {
         current = newSide;
-        if (current == QDeclarativeFlipable::Back) {
+        if (current == QDeclarativeFlipable::Back && back) {
             QTransform mat;
             mat.translate(back->width()/2,back->height()/2);
             if (back->width() && p1.x() >= p2.x())