diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-13 22:00:15 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-10-13 22:00:15 (GMT) |
| commit | f103ad276181090da8c70bd29f4474ea7657e03f (patch) | |
| tree | 699011ee56f49596079e786e93d8d507990f9614 /src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h | |
| parent | b6a25ff0118adc4aa6ab1523496fd1a5e384ebd4 (diff) | |
| parent | 28ef9731df2b3cd865af89cc474c5fa20c24e492 (diff) | |
| download | Qt-f103ad276181090da8c70bd29f4474ea7657e03f.zip Qt-f103ad276181090da8c70bd29f4474ea7657e03f.tar.gz Qt-f103ad276181090da8c70bd29f4474ea7657e03f.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h b/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h index aee8b28..3d23ba9 100644 --- a/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h @@ -69,6 +69,7 @@ public: QDeclarativeImageBasePrivate() : status(QDeclarativeImageBase::Null), progress(0.0), + explicitSourceSize(false), async(false) { QGraphicsItemPrivate::flags = QGraphicsItemPrivate::flags & ~QGraphicsItem::ItemHasNoContents; @@ -79,6 +80,7 @@ public: QUrl url; qreal progress; QSize sourcesize; + bool explicitSourceSize : 1; bool async : 1; }; |