From f21e9ba6efa2b1c8169491db271f79b87b5b0ce4 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
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>
---
 src/qmltest/quicktestresult.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/qmltest/quicktestresult.cpp')

diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp
index 8a15062cd6..4344fb6b5e 100644
--- a/src/qmltest/quicktestresult.cpp
+++ b/src/qmltest/quicktestresult.cpp
@@ -579,7 +579,7 @@ bool QuickTestResult::waitForRendering(QQuickItem *item, int timeout)
 {
     Q_ASSERT(item);
 
-    return qWaitForSignal(item->canvas(), SIGNAL(frameSwapped()), timeout);
+    return qWaitForSignal(item->window(), SIGNAL(frameSwapped()), timeout);
 }
 
 void QuickTestResult::startMeasurement()
-- 
cgit v1.2.3