From f21e9ba6efa2b1c8169491db271f79b87b5b0ce4 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Tue, 7 Aug 2012 11:26:37 +1000 Subject: Remove interim compatibility measures Also update some variables in qtdeclarative which failed to update rootItem->contentItem. Change-Id: Id34e29546a22a74a7ae2ad90ee3a8def6fc541d3 Reviewed-by: Alan Alpert <416365416c@gmail.com> --- tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp') diff --git a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp index cb161c0eeb..b9a18eec01 100644 --- a/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp +++ b/tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp @@ -1481,13 +1481,13 @@ void tst_qquickpositioners::test_repeater() { QQuickView *window = createView(testFile("repeatertest.qml")); - QQuickRectangle *one = findItem(window->rootItem(), "one"); + QQuickRectangle *one = findItem(window->contentItem(), "one"); QVERIFY(one != 0); - QQuickRectangle *two = findItem(window->rootItem(), "two"); + QQuickRectangle *two = findItem(window->contentItem(), "two"); QVERIFY(two != 0); - QQuickRectangle *three = findItem(window->rootItem(), "three"); + QQuickRectangle *three = findItem(window->contentItem(), "three"); QVERIFY(three != 0); QCOMPARE(one->x(), 0.0); -- cgit v1.2.3