Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp

Done-with: Val Doroshchuk <valentyn.doroshchuk@qt.io>
Change-Id: I745dd948c1e98180115f85c17bef802351bbdb6b

1 files changed, 1 insertions, 15 deletions

diff --git a/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp b/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp
index dd739d0e3..645b5d3c6 100644
--- a/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp
+++ b/tests/auto/integration/qdeclarativevideooutput_window/tst_qdeclarativevideooutput_window.cpp
@@ -193,22 +193,8 @@ void tst_QDeclarativeVideoOutputWindow::initTestCase()
 {
     qRegisterMetaType<QDeclarativeVideoOutput::FillMode>();
 
-    const QByteArray qmlSource =
-            "import QtQuick 2.0\n"
-            "import QtMultimedia 5.0\n\n"
-            "Item {"
-            "    width: 200;"
-            "    height: 200;"
-            "    VideoOutput {"
-            "        objectName: \"videoOutput\";"
-            "        x: 25; y: 50;"
-            "        width: 150;"
-            "        height: 100;"
-            "    }"
-            "}";
-
     QQmlComponent component(&m_engine);
-    component.setData(qmlSource, QUrl());
+    component.loadUrl(QUrl("qrc:/main.qml"));
 
     m_rootItem.reset(qobject_cast<QQuickItem *>(component.create()));
     m_videoItem = m_rootItem->findChild<QQuickItem *>("videoOutput");