diff options
| author | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-21 12:49:44 (GMT) |
|---|---|---|
| committer | Bjørn Erik Nilsen <bjorn.nilsen@nokia.com> | 2009-08-21 12:49:44 (GMT) |
| commit | 1b305c739979f7d0e8cb6ebbac6d29ca2e6b060d (patch) | |
| tree | db59e171448e2b8df82a4c877f82b75729e05a50 | |
| parent | 1959b56b331286b4d7d2cc560736992535f06042 (diff) | |
| download | Qt-1b305c739979f7d0e8cb6ebbac6d29ca2e6b060d.zip Qt-1b305c739979f7d0e8cb6ebbac6d29ca2e6b060d.tar.gz Qt-1b305c739979f7d0e8cb6ebbac6d29ca2e6b060d.tar.bz2 | |
Cleanup after wrong merge.
ExtraGestures is not in the master branch, and gestures has not been
touched in the kinetic-graphicseffect branch so this must be a result of
a wrong merge at some point. Remove it.
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 5838fc0..77f203f 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -106,8 +106,7 @@ public: ExtraCursor, ExtraCacheData, ExtraMaxDeviceCoordCacheSize, - ExtraBoundingRegionGranularity, - ExtraGestures + ExtraBoundingRegionGranularity }; enum AncestorFlag { |