diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-07-20 03:42:59 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-07-20 03:42:59 (GMT) |
| commit | 2b55d441c6ef87a641d7e7c13ed2e766c6211829 (patch) | |
| tree | 6a9b3d63f5e007c4402573b198147aceeaa47ba6 /src/declarative/fx/qfximage_p.h | |
| parent | 7b1484e05a28c20a993efe0c2ec42ae25cbff13f (diff) | |
| parent | bd25c0401644e1a1f443532c3e2a75201422b255 (diff) | |
| download | Qt-2b55d441c6ef87a641d7e7c13ed2e766c6211829.zip Qt-2b55d441c6ef87a641d7e7c13ed2e766c6211829.tar.gz Qt-2b55d441c6ef87a641d7e7c13ed2e766c6211829.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/fx/qfximage_p.h')
| -rw-r--r-- | src/declarative/fx/qfximage_p.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/declarative/fx/qfximage_p.h b/src/declarative/fx/qfximage_p.h index e4a3a90..7792dbf 100644 --- a/src/declarative/fx/qfximage_p.h +++ b/src/declarative/fx/qfximage_p.h @@ -55,6 +55,8 @@ #include "qfxitem_p.h" +#include <QtCore/qpointer.h> + QT_BEGIN_NAMESPACE class QSvgRenderer; @@ -69,11 +71,12 @@ class QFxImagePrivate : public QFxItemPrivate public: QFxImagePrivate() : scaleGrid(0), tiled(false), smooth(false), opaque(false), - status(QFxImage::Idle), sciReply(0), progress(0.0) + preserveAspect(false), status(QFxImage::Idle), sciReply(0), + progress(0.0) { } - ~QFxImagePrivate() + ~QFxImagePrivate() { delete scaleGrid; } @@ -82,16 +85,17 @@ public: QFxScaleGrid *getScaleGrid() { - if (!scaleGrid) + if (!scaleGrid) scaleGrid = new QFxScaleGrid; return scaleGrid; } - + QFxScaleGrid *scaleGrid; QPixmap pix; bool tiled : 1; bool smooth : 1; bool opaque : 1; + bool preserveAspect : 1; QFxImage::Status status; QUrl url; |