diff options
Diffstat (limited to 'tests/auto/integration')
| -rw-r--r-- | tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/integration/qsoundeffect/qsoundeffect.pro | 3 |
2 files changed, 3 insertions, 2 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)); diff --git a/tests/auto/integration/qsoundeffect/qsoundeffect.pro b/tests/auto/integration/qsoundeffect/qsoundeffect.pro index e3200ce5a..2fffaf716 100644 --- a/tests/auto/integration/qsoundeffect/qsoundeffect.pro +++ b/tests/auto/integration/qsoundeffect/qsoundeffect.pro @@ -16,5 +16,6 @@ unix:!mac { TESTDATA += test.wav -win32: CONFIG += insignificant_test +win32:CONFIG += insignificant_test # QTBUG-26509 +linux-*:CONFIG += insignificant_test # QTBUG-26748 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |