diff options
-rw-r--r-- | src/imports/multimedia/qdeclarativevideooutput_window.cpp | 6 | ||||
-rw-r--r-- | tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/multimedia/qdeclarativevideooutput_window.cpp b/src/imports/multimedia/qdeclarativevideooutput_window.cpp index 0fe32b399..527c08908 100644 --- 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 55e00ad05..8613753d6 100644 --- 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)); |