diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-26 10:12:51 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-26 10:12:51 (GMT) |
| commit | b6d42a179c021e7544242edb82d8368af27c4dad (patch) | |
| tree | 35a09dc8f6a5bc810dc49036828bca159a47b8ee | |
| parent | 12ebfedc3de64e99082ca573351bdd24b1d42370 (diff) | |
| download | Qt-b6d42a179c021e7544242edb82d8368af27c4dad.zip Qt-b6d42a179c021e7544242edb82d8368af27c4dad.tar.gz Qt-b6d42a179c021e7544242edb82d8368af27c4dad.tar.bz2 | |
Compile fix after conflict resolution
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 }; |