diff options
Diffstat (limited to 'src/imports/multimedia/multimedia.cpp')
| -rw-r--r-- | src/imports/multimedia/multimedia.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index 6aebb7482..2de7401c9 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -50,10 +50,13 @@ #include "qdeclarativevideooutput_p.h" #include "qdeclarativeradio_p.h" #include "qdeclarativebackgroundaudio_p.h" -#if 0 #include "qdeclarativecamera_p.h" #include "qdeclarativecamerapreviewprovider_p.h" -#endif +#include "qdeclarativecameraexposure_p.h" +#include "qdeclarativecameraflash_p.h" +#include "qdeclarativecamerafocus_p.h" +#include "qdeclarativecameraimageprocessing_p.h" + QML_DECLARE_TYPE(QSoundEffect) @@ -73,20 +76,24 @@ public: qmlRegisterType<QDeclarativeVideoOutput>(uri, 4, 0, "VideoOutput"); qmlRegisterType<QDeclarativeRadio>(uri, 4, 0, "Radio"); qmlRegisterType<QDeclarativeBackgroundAudio>(uri, 4, 0, "BackgroundAudio"); - /* Disabled until ported to scenegraph */ -#if 0 qmlRegisterType<QDeclarativeCamera>(uri, 4, 0, "Camera"); -#endif + qmlRegisterUncreatableType<QDeclarativeCameraCapture>(uri, 4, 0, "CameraCapture", + trUtf8("CameraCapture is only provided by Camera element")); + qmlRegisterUncreatableType<QDeclarativeCameraRecorder>(uri, 4, 0, "CameraRecorder", + trUtf8("CameraRecorder is only provided by Camera element")); + qmlRegisterUncreatableType<QDeclarativeCameraExposure>(uri, 4, 0, "CameraExposure", + trUtf8("CameraExposure is only provided by Camera element")); + qmlRegisterUncreatableType<QDeclarativeCameraFocus>(uri, 4, 0, "CameraFocus", + trUtf8("CameraFocus is only provided by Camera element")); + qmlRegisterUncreatableType<QDeclarativeCameraImageProcessing>(uri, 4, 0, "CameraImageProcessing", + trUtf8("CameraImageProcessing is only provided by Camera element")); qmlRegisterType<QDeclarativeMediaMetaData>(); } void initializeEngine(QDeclarativeEngine *engine, const char *uri) { Q_UNUSED(uri); - Q_UNUSED(engine); -#if 0 engine->addImageProvider("camera", new QDeclarativeCameraPreviewProvider); -#endif } }; |