summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativelayoutitem
diff options
context:
space:
mode:
authorA-Team <ateam@pad.test.qt.nokia.com>2010-10-05 22:00:13 (GMT)
committerA-Team <ateam@pad.test.qt.nokia.com>2010-10-05 22:00:13 (GMT)
commitcbd26879cb942a2c4ee7ccd919ee18a45b5b87bb (patch)
treebeb5782a54a102fad2ed78c8231f6ef093ceada9 /tests/auto/declarative/qdeclarativelayoutitem
parente3bcf44684aa30271c986911b328c9d9c372912a (diff)
parent591807899deb3fc479bd32722756f74b899977d5 (diff)
downloadQt-cbd26879cb942a2c4ee7ccd919ee18a45b5b87bb.zip
Qt-cbd26879cb942a2c4ee7ccd919ee18a45b5b87bb.tar.gz
Qt-cbd26879cb942a2c4ee7ccd919ee18a45b5b87bb.tar.bz2
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'tests/auto/declarative/qdeclarativelayoutitem')
-rw-r--r--tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp b/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp
index bbdba74..cc0f633 100644
--- a/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp
+++ b/tests/auto/declarative/qdeclarativelayoutitem/tst_qdeclarativelayoutitem.cpp
@@ -82,6 +82,11 @@ void tst_qdeclarativelayoutitem::test_resizing()
QDeclarativeEngine engine;
QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/layoutItem.qml"));
QDeclarativeLayoutItem* obj = static_cast<QDeclarativeLayoutItem*>(c.create());
+ QVERIFY(obj);
+ QCOMPARE(obj->minimumSize(), QSizeF(100,100));
+ QCOMPARE(obj->preferredSize(), QSizeF(200,200));
+ QCOMPARE(obj->maximumSize(), QSizeF(300,300));
+
layout->addItem(obj);
layout->setContentsMargins(0,0,0,0);
widget->setContentsMargins(0,0,0,0);