Compile after removal of compatibility code in QtQuick.

qtdeclarative: f21e9ba6efa2b1c8169491db271f79b87b5b0ce4
removed QQuickCanvas.

Change-Id: Ica8ae4d816d1ca08f08d299cec741837a1a77c50
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

diff --git a/src/imports/multimedia/qdeclarativevideooutput_window.cpp b/src/imports/multimedia/qdeclarativevideooutput_window.cpp
index 0fe32b3..527c089 100644 (file)
--- a/src/imports/multimedia/qdeclarativevideooutput_window.cpp
+++ b/src/imports/multimedia/qdeclarativevideooutput_window.cpp
@@ -41,7 +41,7 @@
 
 #include "qdeclarativevideooutput_window_p.h"
 #include "qdeclarativevideooutput_p.h"
-#include <QtQuick/qquickcanvas.h>
+#include <QtQuick/qquickwindow.h>
 #include <QtMultimedia/qmediaservice.h>
 #include <QtMultimedia/qvideowindowcontrol.h>
 
@@ -63,8 +63,8 @@ bool QDeclarativeVideoWindowBackend::init(QMediaService *service)
 {
     if (QMediaControl *control = service->requestControl(QVideoWindowControl_iid)) {
         if ((m_videoWindowControl = qobject_cast<QVideoWindowControl *>(control))) {
-            if (q->canvas())
-                m_videoWindowControl->setWinId(q->canvas()->winId());
+            if (q->window())
+                m_videoWindowControl->setWinId(q->window()->winId());
             m_service = service;
             QObject::connect(m_videoWindowControl.data(), SIGNAL(nativeSizeChanged()),
                              q, SLOT(_q_updateNativeSize()));

diff --git a/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp b/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp
index 55e00ad..8613753 100644 (file)
--- a/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp
+++ b/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp
@@ -226,7 +226,7 @@ void tst_QDeclarativeVideoOutputWindow::initTestCase()
     m_rootItem.reset(qobject_cast<QQuickItem *>(component.create()));
     m_videoItem = m_rootItem->findChild<QQuickItem *>("videoOutput");
     QVERIFY(m_videoItem);
-    m_rootItem->setParentItem(m_view.rootItem());
+    m_rootItem->setParentItem(m_view.contentItem());
     m_videoItem->setProperty("source", QVariant::fromValue<QObject *>(&m_sourceObject));
 
     m_windowControl.setNativeSize(QSize(400, 200));