summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorToby Tomkins <toby.tomkins@nokia.com>2012-07-18 13:01:34 +1000
committerQt by Nokia <qt-info@nokia.com>2012-07-18 05:11:00 +0200
commitb95f60861210c1770e24bb0ba158c4dac155a2bf (patch)
tree5c49a0930c9c38e891dd50d468856a7502f5c7c0 /src
parent0e550eaae9140b8ef0713573a7549662af28b0df (diff)
Fix QQuickCanvas renames.
This is required because of name changes to QtDeclarative in the commit feb996e3ab44e68082c97102556ea396f5df3f44. Change-Id: Ia40b1ea1cf3b3cb5225b7678077b627b74c47132 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/imports/multimedia/qdeclarativevideooutput_window.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/multimedia/qdeclarativevideooutput_window.cpp b/src/imports/multimedia/qdeclarativevideooutput_window.cpp
index 91512d734..d85a20f54 100644
--- a/src/imports/multimedia/qdeclarativevideooutput_window.cpp
+++ b/src/imports/multimedia/qdeclarativevideooutput_window.cpp
@@ -77,8 +77,8 @@ void QDeclarativeVideoWindowBackend::itemChange(QQuickItem::ItemChange change,
const QQuickItem::ItemChangeData &changeData)
{
if (change == QQuickItem::ItemSceneChange && m_videoWindowControl) {
- if (changeData.canvas)
- m_videoWindowControl->setWinId(changeData.canvas->winId());
+ if (changeData.window)
+ m_videoWindowControl->setWinId(changeData.window->winId());
else
m_videoWindowControl->setWinId(0);
}