diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-04-24 10:58:04 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-24 11:47:54 +0200 |
commit | 5ae3adcfa9249fa6a9a9f8d2849dc3a749828481 (patch) | |
tree | db43904bc83b5c7f6dc8fe80c674591861e63ef2 /tests/auto/integration/qdeclarativevideooutput | |
parent | e2f5779d2a918942d61e4ebf2acdc2ae5a97b5de (diff) | |
download | qtmultimedia-5ae3adcfa9249fa6a9a9f8d2849dc3a749828481.tar.gz |
Fix compilation after qtbase:8f85b84f4eaa85ff5c02ec5e65fd6706a10690b9.
Remove QDeclarative compatibility module code.
Change-Id: Ib24c0c027c899e7eb30b3c8550a483d0d8b2b77f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/integration/qdeclarativevideooutput')
-rw-r--r-- | tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp index 6f542dbb7..6fb110fc4 100644 --- a/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp +++ b/tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp @@ -140,11 +140,11 @@ private slots: // to holder? private: - QDeclarativeEngine m_engine; + QQmlEngine m_engine; QByteArray m_plainQML; // Variables used for the mapping test - QDeclarativeComponent *m_mappingComponent; + QQmlComponent *m_mappingComponent; QObject *m_mappingOutput; SurfaceHolder *m_mappingSurface; @@ -165,7 +165,7 @@ void tst_QDeclarativeVideoOutput::initTestCase() "}"; // We initialize the mapping vars here - m_mappingComponent = new QDeclarativeComponent(&m_engine); + m_mappingComponent = new QQmlComponent(&m_engine); m_mappingComponent->setData(m_plainQML, QUrl()); m_mappingSurface = new SurfaceHolder(this); @@ -182,7 +182,7 @@ Q_DECLARE_METATYPE(QDeclarativeVideoOutput::FillMode) void tst_QDeclarativeVideoOutput::fillMode() { - QDeclarativeComponent component(&m_engine); + QQmlComponent component(&m_engine); component.setData(m_plainQML, QUrl()); QObject *videoOutput = component.create(); @@ -211,7 +211,7 @@ void tst_QDeclarativeVideoOutput::fillMode() void tst_QDeclarativeVideoOutput::orientation() { - QDeclarativeComponent component(&m_engine); + QQmlComponent component(&m_engine); component.setData(m_plainQML, QUrl()); QObject *videoOutput = component.create(); @@ -264,7 +264,7 @@ void tst_QDeclarativeVideoOutput::orientation() void tst_QDeclarativeVideoOutput::surfaceSource() { - QDeclarativeComponent component(&m_engine); + QQmlComponent component(&m_engine); component.setData(m_plainQML, QUrl()); QObject *videoOutput = component.create(); @@ -350,7 +350,7 @@ void tst_QDeclarativeVideoOutput::surfaceSource() void tst_QDeclarativeVideoOutput::sourceRect() { - QDeclarativeComponent component(&m_engine); + QQmlComponent component(&m_engine); component.setData(m_plainQML, QUrl()); QObject *videoOutput = component.create(); |