slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compile after removal of compatibility code in QtQuick.

Browse Source 
qtdeclarative: f21e9ba6efa2b1c8169491db271f79b87b5b0ce4
removed QQuickCanvas.

Change-Id: Ica8ae4d816d1ca08f08d299cec741837a1a77c50
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Friedemann Kleint
2012-10-16 15:46:46 +02:00
committed by The Qt Project
parent 89ba86d7bc
commit a410276d0d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/imports/multimedia/qdeclarativevideooutput_window.cpp
View File

@@ -41,7 +41,7 @@
#include "qdeclarativevideooutput_window_p.h" #include "qdeclarativevideooutput_window_p.h"
#include "qdeclarativevideooutput_p.h" #include "qdeclarativevideooutput_p.h"
#include <QtQuick/qquickcanvas.h> #include <QtQuick/qquickwindow.h>
#include <QtMultimedia/qmediaservice.h> #include <QtMultimedia/qmediaservice.h>
#include <QtMultimedia/qvideowindowcontrol.h> #include <QtMultimedia/qvideowindowcontrol.h>
@@ -63,8 +63,8 @@ bool QDeclarativeVideoWindowBackend::init(QMediaService *service)
{ {
if (QMediaControl *control = service->requestControl(QVideoWindowControl_iid)) { if (QMediaControl *control = service->requestControl(QVideoWindowControl_iid)) {
if ((m_videoWindowControl = qobject_cast<QVideoWindowControl *>(control))) { if ((m_videoWindowControl = qobject_cast<QVideoWindowControl *>(control))) {
if (q->canvas()) if (q->window())
m_videoWindowControl->setWinId(q->canvas()->winId()); m_videoWindowControl->setWinId(q->window()->winId());
m_service = service; m_service = service;
QObject::connect(m_videoWindowControl.data(), SIGNAL(nativeSizeChanged()), QObject::connect(m_videoWindowControl.data(), SIGNAL(nativeSizeChanged()),
q, SLOT(_q_updateNativeSize())); q, SLOT(_q_updateNativeSize()));

2
tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp
View File

@@ -226,7 +226,7 @@ void tst_QDeclarativeVideoOutputWindow::initTestCase()
m_rootItem.reset(qobject_cast<QQuickItem *>(component.create())); m_rootItem.reset(qobject_cast<QQuickItem *>(component.create()));
m_videoItem = m_rootItem->findChild<QQuickItem *>("videoOutput"); m_videoItem = m_rootItem->findChild<QQuickItem *>("videoOutput");
QVERIFY(m_videoItem); 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_videoItem->setProperty("source", QVariant::fromValue<QObject *>(&m_sourceObject));
m_windowControl.setNativeSize(QSize(400, 200)); m_windowControl.setNativeSize(QSize(400, 200));