From b6d42a179c021e7544242edb82d8368af27c4dad Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" <bradley.hughes@nokia.com>
Date: Tue, 26 May 2009 12:12:51 +0200
Subject: Compile fix after conflict resolution

---
 src/gui/graphicsview/qgraphicsitem_p.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h
index 4a12bcb..c0ab9e1 100644
--- a/src/gui/graphicsview/qgraphicsitem_p.h
+++ b/src/gui/graphicsview/qgraphicsitem_p.h
@@ -120,7 +120,7 @@ public:
         ExtraBoundingRegionGranularity,
         ExtraOpacity,
         ExtraEffectiveOpacity,
-        ExtraDecomposedTransform
+        ExtraDecomposedTransform,
         ExtraGestures
     };
 
-- 
cgit v0.12