diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-16 23:32:03 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-16 23:32:03 (GMT) |
| commit | 917fedf1ed887a7b14b034e4ecd5e9bb451f1494 (patch) | |
| tree | 78a08bdd1d3e7343ec29959d7022d08f40aee2f6 /src/gui/graphicsview/qgraphicsitem.h | |
| parent | 42a21fb616fa32ffd6a26f801b60cf73b370a31c (diff) | |
| parent | 73b32e942696156c7c9fe84682394ec26f16c5c6 (diff) | |
| download | Qt-917fedf1ed887a7b14b034e4ecd5e9bb451f1494.zip Qt-917fedf1ed887a7b14b034e4ecd5e9bb451f1494.tar.gz Qt-917fedf1ed887a7b14b034e4ecd5e9bb451f1494.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Introduce QGraphicsItem::ItemStopsFocusHandling flag
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h index e59a7c9..67c9cd3 100644 --- a/src/gui/graphicsview/qgraphicsitem.h +++ b/src/gui/graphicsview/qgraphicsitem.h @@ -107,7 +107,8 @@ public: ItemIsPanel = 0x4000, ItemIsFocusScope = 0x8000, // internal ItemSendsScenePositionChanges = 0x10000, - ItemStopsClickFocusPropagation = 0x20000 + ItemStopsClickFocusPropagation = 0x20000, + ItemStopsFocusHandling = 0x40000 // NB! Don't forget to increase the d_ptr->flags bit field by 1 when adding a new flag. }; Q_DECLARE_FLAGS(GraphicsItemFlags, GraphicsItemFlag) |