diff options
| author | Iain <qt-info@nokia.com> | 2009-09-11 09:49:23 (GMT) |
|---|---|---|
| committer | Iain <qt-info@nokia.com> | 2009-09-11 09:49:23 (GMT) |
| commit | 04fc98f2ed323c71a8671542f4f37faa988c434f (patch) | |
| tree | 11a5dc618d6dfc27d8aafe3bf3a28981325a7304 /src/gui/graphicsview/qgraphicsitem.h | |
| parent | 3d4a2cd013f9e62788adf902a57ae8e2f31fccc7 (diff) | |
| parent | 92789fabd6728820b244d23d7477f2a224a33f94 (diff) | |
| download | Qt-04fc98f2ed323c71a8671542f4f37faa988c434f.zip Qt-04fc98f2ed323c71a8671542f4f37faa988c434f.tar.gz Qt-04fc98f2ed323c71a8671542f4f37faa988c434f.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/graphicsview/qgraphicsitem.h')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h index 1b65700..1c969ba 100644 --- a/src/gui/graphicsview/qgraphicsitem.h +++ b/src/gui/graphicsview/qgraphicsitem.h @@ -103,9 +103,8 @@ public: ItemHasNoContents = 0x400, ItemSendsGeometryChanges = 0x800, ItemAcceptsInputMethod = 0x1000, - ItemAutoDetectsFocusProxy = 0x2000, - ItemNegativeZStacksBehindParent = 0x4000, - ItemIsPanel = 0x8000 + ItemNegativeZStacksBehindParent = 0x2000, + ItemIsPanel = 0x4000 // NB! Don't forget to increase the d_ptr->flags bit field by 1 when adding a new flag. }; Q_DECLARE_FLAGS(GraphicsItemFlags, GraphicsItemFlag) |