diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-11-19 07:07:57 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-11-19 07:07:57 (GMT) |
| commit | 5439a148cc5045769c336cf8e8228bc0e8b8f746 (patch) | |
| tree | 87e21f5442e254c3d854e00c643b302840d40c1a /src/declarative/graphicsitems | |
| parent | 244c5fbcf4556f4cfbf82500c4712abda3e77e9b (diff) | |
| parent | 337eff4a30844d85c6344091e75acb493771237f (diff) | |
| download | Qt-5439a148cc5045769c336cf8e8228bc0e8b8f746.zip Qt-5439a148cc5045769c336cf8e8228bc0e8b8f746.tar.gz Qt-5439a148cc5045769c336cf8e8228bc0e8b8f746.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/graphicsitems')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsimagebase.cpp | 6 | ||||
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsimagebase_p.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp index 3e86a7c..6cd1c05 100644 --- a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp @@ -49,12 +49,6 @@ QT_BEGIN_NAMESPACE -QmlGraphicsImageBase::QmlGraphicsImageBase(QmlGraphicsItem *parent) - : QmlGraphicsItem(*(new QmlGraphicsImageBasePrivate), parent) -{ - setFlag(QGraphicsItem::ItemHasNoContents, true); -} - QmlGraphicsImageBase::QmlGraphicsImageBase(QmlGraphicsImageBasePrivate &dd, QmlGraphicsItem *parent) : QmlGraphicsItem(dd, parent) { diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h b/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h index 8144ce0..bab93b7 100644 --- a/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h +++ b/src/declarative/graphicsitems/qmlgraphicsimagebase_p.h @@ -59,7 +59,6 @@ class Q_DECLARATIVE_EXPORT QmlGraphicsImageBase : public QmlGraphicsItem Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged) public: - QmlGraphicsImageBase(QmlGraphicsItem *parent = 0); ~QmlGraphicsImageBase(); enum Status { Null, Ready, Loading, Error }; Status status() const; |