diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-09-09 05:48:15 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-09-09 05:48:15 (GMT) |
| commit | 539206ac11fc341db6e29ebdc3c838848f822bc5 (patch) | |
| tree | a7e1a7f79bf2a1140446f06a1aed01786be13f18 /src/declarative/fx/qfxloader_p.h | |
| parent | 4c0abed6af10a2722ad3f1fd352caa3fe673468e (diff) | |
| parent | ae7a3485c0e6748361789491af33ee7b7fe093bc (diff) | |
| download | Qt-539206ac11fc341db6e29ebdc3c838848f822bc5.zip Qt-539206ac11fc341db6e29ebdc3c838848f822bc5.tar.gz Qt-539206ac11fc341db6e29ebdc3c838848f822bc5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfxloader_p.h')
| -rw-r--r-- | src/declarative/fx/qfxloader_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxloader_p.h b/src/declarative/fx/qfxloader_p.h index 13f3b53..0700fcd 100644 --- a/src/declarative/fx/qfxloader_p.h +++ b/src/declarative/fx/qfxloader_p.h @@ -69,10 +69,12 @@ public: QUrl source; QFxItem *item; - QmlComponent *qmlcomp; - QHash<QString, QFxItem *> cachedChildren; + QmlComponent *component; + bool ownComponent; + QFxLoader::ResizeMode resizeMode; void _q_sourceLoaded(); + void _q_updateSize(); }; QT_END_NAMESPACE |