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/qquickitemlayer | |
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/qquickitemlayer')
-rw-r--r-- | tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp index 61762cb688..fdf834ce08 100644 --- a/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp +++ b/tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp @@ -259,7 +259,7 @@ void tst_QQuickItemLayer::layerVisibility() QQuickView view; view.setSource(testFileUrl("Visible.qml")); - QQuickItem *child = view.rootItem()->childItems().at(0); + QQuickItem *child = view.contentItem()->childItems().at(0); child->setProperty("layerVisible", visible); child->setProperty("layerEffect", effect); child->setProperty("layerOpacity", opacity); @@ -305,7 +305,7 @@ void tst_QQuickItemLayer::layerZOrder() QQuickView view; view.setSource(testFileUrl("ZOrder.qml")); - QQuickItem *child = view.rootItem()->childItems().at(0); + QQuickItem *child = view.contentItem()->childItems().at(0); child->setProperty("layerEffect", effect); view.show(); @@ -340,7 +340,7 @@ void tst_QQuickItemLayer::changeZOrder() QQuickView view; view.setSource(testFileUrl("ZOrderChange.qml")); - QQuickItem *child = view.rootItem()->childItems().at(0); + QQuickItem *child = view.contentItem()->childItems().at(0); child->setProperty("layerEnabled", layered); child->setProperty("layerEffect", effect); child->setProperty("layerZ", 1); |