Remove QDeclarativeLoader::resizeMode

The explicit resizeMode is superfluous, all usecases could be achieved
with the corrected default behaviour of the former ResizeLoaderToItem
mode. The NoResize usecase is covered by wrapping the loader in an extra
item.

That means: A loader automatically gets its size from the item loaded
unless the loader has an explicit size itself.

Go-ahead-by: Michael Brasser

1 files changed, 0 insertions, 7 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeloader_p.h b/src/declarative/graphicsitems/qdeclarativeloader_p.h
index e9fd8e9..49dfa11 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeloader_p.h
@@ -55,11 +55,9 @@ class Q_DECLARATIVE_EXPORT QDeclarativeLoader : public QDeclarativeItem
 {
     Q_OBJECT
     Q_ENUMS(Status)
-    Q_ENUMS(ResizeMode)
 
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
     Q_PROPERTY(QDeclarativeComponent *sourceComponent READ sourceComponent WRITE setSourceComponent RESET resetSourceComponent NOTIFY sourceChanged)
-    Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode NOTIFY resizeModeChanged)
     Q_PROPERTY(QGraphicsObject *item READ item NOTIFY itemChanged)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
@@ -79,10 +77,6 @@ public:
     Status status() const;
     qreal progress() const;
 
-    enum ResizeMode { NoResize, SizeLoaderToItem, SizeItemToLoader };
-    ResizeMode resizeMode() const;
-    void setResizeMode(ResizeMode mode);
-
     QGraphicsObject *item() const;
 
 Q_SIGNALS:
@@ -90,7 +84,6 @@ Q_SIGNALS:
     void sourceChanged();
     void statusChanged();
     void progressChanged();
-    void resizeModeChanged();
 
 protected:
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);