diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2012-08-07 11:26:37 +1000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-16 07:24:06 +0200 |
commit | f21e9ba6efa2b1c8169491db271f79b87b5b0ce4 (patch) | |
tree | 6eabf1ad37e12247f210e3fe77f64abf6255aa56 /tests/auto/quick/examples | |
parent | cc39a7d7affe37741292989c634aec3f60660c0e (diff) |
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>
Diffstat (limited to 'tests/auto/quick/examples')
-rw-r--r-- | tests/auto/quick/examples/tst_examples.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp index 70efc5eac5..f651655244 100644 --- a/tests/auto/quick/examples/tst_examples.cpp +++ b/tests/auto/quick/examples/tst_examples.cpp @@ -275,7 +275,7 @@ void tst_examples::sgexamples() window->show(); QVERIFY(QTest::qWaitForWindowExposed(window)); } - root->setParentItem(window->rootItem()); + root->setParentItem(window->contentItem()); component.completeCreate(); qApp->processEvents(); @@ -319,7 +319,7 @@ void tst_examples::sgsnippets() window->show(); QVERIFY(QTest::qWaitForWindowExposed(window)); } - root->setParentItem(window->rootItem()); + root->setParentItem(window->contentItem()); component.completeCreate(); qApp->processEvents(); |