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/qquicktextedit | |
| 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/qquicktextedit')
| -rw-r--r-- | tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp index 0f69009815..a5a5efb2d0 100644 --- a/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp @@ -1191,7 +1191,7 @@ void tst_qquicktextedit::focusOnPress() QQuickWindow window; window.resize(100, 50); - textEditObject->setParentItem(window.rootItem()); + textEditObject->setParentItem(window.contentItem()); window.show(); window.requestActivateWindow(); QTest::qWaitForWindowActive(&window); @@ -2903,7 +2903,7 @@ void tst_qquicktextedit::openInputPanel() anotherEdit.setFocus(false); QVERIFY(qApp->focusObject() != &anotherEdit); - QCOMPARE(view.activeFocusItem(), view.rootItem()); + QCOMPARE(view.activeFocusItem(), view.contentItem()); anotherEdit.setFocus(true); qApp->inputMethod()->hide(); @@ -4253,7 +4253,7 @@ void tst_qquicktextedit::keySequence() QVERIFY(textEdit != 0); QQuickWindow window; - textEdit->setParentItem(window.rootItem()); + textEdit->setParentItem(window.contentItem()); window.show(); window.requestActivateWindow(); QTest::qWaitForWindowActive(&window); @@ -4416,7 +4416,7 @@ void tst_qquicktextedit::undo() QVERIFY(textEdit != 0); QQuickWindow window; - textEdit->setParentItem(window.rootItem()); + textEdit->setParentItem(window.contentItem()); window.show(); window.requestActivateWindow(); QTest::qWaitForWindowActive(&window); @@ -4502,7 +4502,7 @@ void tst_qquicktextedit::redo() QVERIFY(textEdit != 0); QQuickWindow window; - textEdit->setParentItem(window.rootItem()); + textEdit->setParentItem(window.contentItem()); window.show(); window.requestActivateWindow(); QTest::qWaitForWindowActive(&window); @@ -4726,7 +4726,7 @@ void tst_qquicktextedit::undo_keypressevents() QVERIFY(textEdit != 0); QQuickWindow window; - textEdit->setParentItem(window.rootItem()); + textEdit->setParentItem(window.contentItem()); window.show(); window.requestActivateWindow(); QTest::qWaitForWindowActive(&window); |