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

2
src/imports/multimedia/multimedia.cpp
View File

@@ -120,7 +120,7 @@ public:
qmlRegisterType<QDeclarativeMediaMetaData>();
}
void initializeEngine(QDeclarativeEngine *engine, const char *uri)
void initializeEngine(QQmlEngine *engine, const char *uri)
{
Q_UNUSED(uri);
engine->addImageProvider("camera", new QDeclarativeCameraPreviewProvider);

2
src/imports/multimedia/qdeclarativecamerapreviewprovider.cpp
View File

@@ -55,7 +55,7 @@ struct QDeclarativeCameraPreviewProviderPrivate
Q_GLOBAL_STATIC(QDeclarativeCameraPreviewProviderPrivate, qDeclarativeCameraPreviewProviderPrivate)
QDeclarativeCameraPreviewProvider::QDeclarativeCameraPreviewProvider()
: QDeclarativeImageProvider(QDeclarativeImageProvider::Image)
: QQuickImageProvider(QQuickImageProvider::Image)
{
}

4
src/imports/multimedia/qdeclarativecamerapreviewprovider_p.h
View File

@@ -53,13 +53,13 @@
// We mean it.
//
#include <QtQml/qqmlimageprovider.h>
#include <QtQuick/qquickimageprovider.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QDeclarativeCameraPreviewProvider : public QQmlImageProvider
class QDeclarativeCameraPreviewProvider : public QQuickImageProvider
{
public:
QDeclarativeCameraPreviewProvider();