diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 15:40:51 +0100 |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@digia.com> | 2012-11-02 15:41:00 +0100 |
| commit | a5947906d3aac7ec2f21a9621f7ad67a761a4560 (patch) | |
| tree | b67a28ecfdf01a0ca71ec51e00ee45ee1491eeaf /tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp | |
| parent | 962e99534d8955ae6c3c3524c5005f518b4e01bc (diff) | |
| parent | 79f585b9e90c311f2c7b905426318d345b1bf641 (diff) | |
Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtmultimedia into newdocs
Change-Id: Idb607da32f80784d94556443be6740c6d7223411
Diffstat (limited to 'tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp')
| -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)); |