Test SizeItemToLoader to SizeLoaderToItem resizeMode change.

Task-number:     QT-2376

2 files changed, 13 insertions, 0 deletions

diff --git a/src/declarative/graphicsitems/qmlgraphicsloader.cpp b/src/declarative/graphicsitems/qmlgraphicsloader.cpp
index 7cd4d1a..50267fc 100644
--- a/src/declarative/graphicsitems/qmlgraphicsloader.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsloader.cpp
@@ -346,6 +346,12 @@ qreal QmlGraphicsLoader::progress() const
     \o SizeItemToLoader - the item will be sized to the size of the Loader.
     \endlist
 
+    Note that changing from SizeItemToLoader to SizeLoaderToItem
+    after the component is loaded will not return the item or Loader
+    to it's original size.  This is due to the item size being adjusted
+    to the Loader size, thereby losing the original size of the item.
+    Future changes to the item's size will affect the loader, however.
+
     The default resizeMode is SizeLoaderToItem.
 */
 QmlGraphicsLoader::ResizeMode QmlGraphicsLoader::resizeMode() const
diff --git a/tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp b/tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp
index 9d61f50..ffd46a9 100644
--- a/tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp
+++ b/tests/auto/declarative/qmlgraphicsloader/tst_qmlgraphicsloader.cpp
@@ -274,6 +274,13 @@ void tst_QmlGraphicsLoader::sizeItemToLoader()
     loader->setHeight(30);
     QCOMPARE(rect->width(), 180.0);
     QCOMPARE(rect->height(), 30.0);
+
+    // Switch mode
+    loader->setResizeMode(QmlGraphicsLoader::SizeLoaderToItem);
+    rect->setWidth(160);
+    rect->setHeight(45);
+    QCOMPARE(rect->width(), 160.0);
+    QCOMPARE(rect->height(), 45.0);
 }
 
 void tst_QmlGraphicsLoader::noResize()