slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation after qtbase:8f85b84f4eaa85ff5c02ec5e65fd6706a10690b9.

Browse Source 
Remove QDeclarative compatibility module code.

Change-Id: Ib24c0c027c899e7eb30b3c8550a483d0d8b2b77f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-04-24 10:58:04 +02:00
committed by Qt by Nokia
parent e2f5779d2a
commit 5ae3adcfa9
15 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp
View File

@@ -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();