diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-10-16 15:46:46 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-16 16:08:20 +0200 |
| commit | a410276d0d0888380a09d50fd80cf85429f04f6b (patch) | |
| tree | 93b6a0dbd7ea91e249620d6fa23bc0a37a5ccff4 /src/imports | |
| parent | 89ba86d7bcca1775af49af6a38e577ef430db19d (diff) | |
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>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/qdeclarativevideooutput_window.cpp | 6 |
1 files changed, 3 insertions, 3 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())); |