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 /src/qmltest/quicktestresult.cpp | |
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 'src/qmltest/quicktestresult.cpp')
-rw-r--r-- | src/qmltest/quicktestresult.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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() |