diff options
Diffstat (limited to 'tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp')
-rw-r--r-- | tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp | 19 |
1 files changed, 5 insertions, 14 deletions
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); |