diff options
8 files changed, 40 insertions, 29 deletions
diff --git a/tests/auto/integration/qdeclarativevideooutput/main.qml b/tests/auto/integration/qdeclarativevideooutput/main.qml new file mode 100644 index 000000000..e456adf6c --- /dev/null +++ b/tests/auto/integration/qdeclarativevideooutput/main.qml @@ -0,0 +1,7 @@ +import QtQuick 2.0 +import QtMultimedia 5.0 + +VideoOutput { + width: 150 + height: 100 +} diff --git a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro index e68e87f79..1f3a00b42 100644 --- a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro +++ b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro @@ -3,6 +3,8 @@ TARGET = tst_qdeclarativevideooutput QT += multimedia-private qml testlib quick CONFIG += testcase +RESOURCES += qml.qrc + SOURCES += \ tst_qdeclarativevideooutput.cpp diff --git a/tests/auto/integration/qdeclarativevideooutput/qml.qrc b/tests/auto/integration/qdeclarativevideooutput/qml.qrc new file mode 100644 index 000000000..5f6483ac3 --- /dev/null +++ b/tests/auto/integration/qdeclarativevideooutput/qml.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>main.qml</file> + </qresource> +</RCC> diff --git a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp index 707a01512..0e9cf6aa3 100644 --- a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp +++ b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp @@ -123,7 +123,6 @@ private slots: private: QQmlEngine m_engine; - QByteArray m_plainQML; // Variables used for the mapping test QQmlComponent *m_mappingComponent; @@ -138,17 +137,9 @@ private: void tst_QDeclarativeVideoOutput::initTestCase() { - m_plainQML = \ - "import QtQuick 2.0\n" \ - "import QtMultimedia 5.0\n" \ - "VideoOutput {" \ - " width: 150;" \ - " height: 100;" \ - "}"; - // We initialize the mapping vars here m_mappingComponent = new QQmlComponent(&m_engine); - m_mappingComponent->setData(m_plainQML, QUrl()); + m_mappingComponent->loadUrl(QUrl("qrc:/main.qml")); m_mappingSurface = new SurfaceHolder(this); m_mappingOutput = m_mappingComponent->create(); @@ -173,7 +164,7 @@ tst_QDeclarativeVideoOutput::tst_QDeclarativeVideoOutput() void tst_QDeclarativeVideoOutput::fillMode() { QQmlComponent component(&m_engine); - component.setData(m_plainQML, QUrl()); + component.loadUrl(QUrl("qrc:/main.qml")); QObject *videoOutput = component.create(); QVERIFY(videoOutput != 0); @@ -202,7 +193,7 @@ void tst_QDeclarativeVideoOutput::fillMode() void tst_QDeclarativeVideoOutput::orientation() { QQmlComponent component(&m_engine); - component.setData(m_plainQML, QUrl()); + component.loadUrl(QUrl("qrc:/main.qml")); QObject *videoOutput = component.create(); QVERIFY(videoOutput != 0); @@ -255,7 +246,7 @@ void tst_QDeclarativeVideoOutput::orientation() void tst_QDeclarativeVideoOutput::surfaceSource() { QQmlComponent component(&m_engine); - component.setData(m_plainQML, QUrl()); + component.loadUrl(QUrl("qrc:/main.qml")); QObject *videoOutput = component.create(); QVERIFY(videoOutput != 0); @@ -341,7 +332,7 @@ void tst_QDeclarativeVideoOutput::surfaceSource() void tst_QDeclarativeVideoOutput::sourceRect() { QQmlComponent component(&m_engine); - component.setData(m_plainQML, QUrl()); + component.loadUrl(QUrl("qrc:/main.qml")); QObject *videoOutput = component.create(); QVERIFY(videoOutput != 0); diff --git a/tests/auto/integration/qdeclarativevideooutput_window/main.qml b/tests/auto/integration/qdeclarativevideooutput_window/main.qml new file mode 100644 index 000000000..8866be147 --- /dev/null +++ b/tests/auto/integration/qdeclarativevideooutput_window/main.qml @@ -0,0 +1,13 @@ +import QtQuick 2.0 +import QtMultimedia 5.0 + +Item { + width: 200 + height: 200 + VideoOutput { + objectName: "videoOutput" + x: 25; y: 50 + width: 150 + height: 100 + } +} diff --git a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro index 975c1d6d0..82108d220 100644 --- a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro +++ b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro @@ -3,6 +3,8 @@ TARGET = tst_qdeclarativevideooutput_window QT += multimedia-private qml testlib quick CONFIG += testcase +RESOURCES += qml.qrc + SOURCES += \ tst_qdeclarativevideooutput_window.cpp diff --git a/tests/auto/integration/qdeclarativevideooutput_window/qml.qrc b/tests/auto/integration/qdeclarativevideooutput_window/qml.qrc new file mode 100644 index 000000000..5f6483ac3 --- /dev/null +++ b/tests/auto/integration/qdeclarativevideooutput_window/qml.qrc @@ -0,0 +1,5 @@ +<RCC> + <qresource prefix="/"> + <file>main.qml</file> + </qresource> +</RCC> 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"); |