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/qquickfocusscope | |
| 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/qquickfocusscope')
| -rw-r--r-- | tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp b/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp index 1cf07d38b6..a614bbbe42 100644 --- a/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp +++ b/tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp @@ -503,7 +503,7 @@ void tst_qquickfocusscope::canvasFocus() QQuickItem *rootObject = view->rootObject(); QVERIFY(rootObject); - QQuickItem *rootItem = view->rootItem(); + QQuickItem *rootItem = view->contentItem(); QQuickItem *scope1 = findItem<QQuickItem>(rootObject, QLatin1String("scope1")); QQuickItem *item1 = findItem<QQuickItem>(rootObject, QLatin1String("item1")); QQuickItem *scope2 = findItem<QQuickItem>(rootObject, QLatin1String("scope2")); |