diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-07-31 05:35:02 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-07-31 05:35:02 (GMT) |
| commit | a8eec858efcfef9e7fb3225589f56fd716ac8c0a (patch) | |
| tree | 161010093453b0743c75522cda3b7c27c1afe6e3 /src/declarative/fx/qfxitem_p.h | |
| parent | 5672de53a0c4181d210d86e369f3dd141af3ef84 (diff) | |
| parent | fc5af680d26aba684f4cbd4caa0440aabc3153d4 (diff) | |
| download | Qt-a8eec858efcfef9e7fb3225589f56fd716ac8c0a.zip Qt-a8eec858efcfef9e7fb3225589f56fd716ac8c0a.tar.gz Qt-a8eec858efcfef9e7fb3225589f56fd716ac8c0a.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxitem_p.h')
| -rw-r--r-- | src/declarative/fx/qfxitem_p.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/declarative/fx/qfxitem_p.h b/src/declarative/fx/qfxitem_p.h index 862171b..ae95fb5 100644 --- a/src/declarative/fx/qfxitem_p.h +++ b/src/declarative/fx/qfxitem_p.h @@ -77,7 +77,7 @@ public: _baselineOffset(0), _componentComplete(true), _keepMouse(false), _anchorLines(0), - _stateGroup(0), canvas(0), origin(QFxItem::TopLeft), + _stateGroup(0), origin(QFxItem::TopLeft), options(QFxItem::NoOption), widthValid(false), heightValid(false), width(0), height(0) {} @@ -176,9 +176,6 @@ public: QmlStateGroup *states(); QmlStateGroup *_stateGroup; - - QGraphicsScene *canvas; - QFxItem::TransformOrigin origin:4; int options:10; bool widthValid:1; |