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 /tests | |
parent | 89ba86d7bcca1775af49af6a38e577ef430db19d (diff) | |
download | qtmultimedia-a410276d0d0888380a09d50fd80cf85429f04f6b.tar.gz |
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 'tests')
-rw-r--r-- | tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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)); |