diff options
| -rw-r--r-- | examples/examples.pro | 2 | ||||
| -rw-r--r-- | src/imports/multimedia/multimedia.cpp | 13 | ||||
| -rw-r--r-- | src/imports/multimedia/multimedia.pro | 25 | ||||
| -rw-r--r-- | tests/auto/multimedia.pro | 4 |
4 files changed, 23 insertions, 21 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 988fd4e38..2a1a2338e 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -14,6 +14,6 @@ SUBDIRS += \ player \ contains(QT_CONFIG, declarative) { - SUBDIRS += declarative-camera + disabled:SUBDIRS += declarative-camera } diff --git a/src/imports/multimedia/multimedia.cpp b/src/imports/multimedia/multimedia.cpp index 4cc904b8e..7a3478107 100644 --- a/src/imports/multimedia/multimedia.cpp +++ b/src/imports/multimedia/multimedia.cpp @@ -63,17 +63,22 @@ public: { Q_ASSERT(QLatin1String(uri) == QLatin1String("QtMultimediaKit")); - qmlRegisterType<QSoundEffect>(uri, 1, 1, "SoundEffect"); - qmlRegisterType<QDeclarativeAudio>(uri, 1, 1, "Audio"); - qmlRegisterType<QDeclarativeVideo>(uri, 1, 1, "Video"); - qmlRegisterType<QDeclarativeCamera>(uri, 1, 1, "Camera"); + qmlRegisterType<QSoundEffect>(uri, 4, 0, "SoundEffect"); + qmlRegisterType<QDeclarativeAudio>(uri, 4, 0, "Audio"); + /* Disabled until ported to scenegraph */ +#if 0 + qmlRegisterType<QDeclarativeVideo>(uri, 4, 0, "Video"); + qmlRegisterType<QDeclarativeCamera>(uri, 4, 0, "Camera"); +#endif qmlRegisterType<QDeclarativeMediaMetaData>(); } void initializeEngine(QDeclarativeEngine *engine, const char *uri) { Q_UNUSED(uri); +#if 0 engine->addImageProvider("camera", new QDeclarativeCameraPreviewProvider); +#endif } }; diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index bef8cb06a..845fe9b96 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -3,7 +3,7 @@ TARGETPATH = Qt/multimediakit include(../qimportbase.pri) -QT += declarative qtquick1 network multimediakit-private +QT += declarative network multimediakit-private DESTDIR = $$QT.multimediakit.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH @@ -12,30 +12,25 @@ HEADERS += \ qdeclarativeaudio_p.h \ qdeclarativemediabase_p.h \ qdeclarativemediametadata_p.h \ - qdeclarativevideo_p.h \ - qdeclarativecamera_p.h \ - qdeclarativecamerapreviewprovider_p.h SOURCES += \ multimedia.cpp \ qdeclarativeaudio.cpp \ qdeclarativemediabase.cpp \ + +disabled { + HEADERS += \ + qdeclarativevideo_p.h \ + qdeclarativecamera_p.h \ + qdeclarativecamerapreviewprovider_p.h + + SOURCES += \ qdeclarativevideo.cpp \ qdeclarativecamera.cpp \ qdeclarativecamerapreviewprovider.cpp +} qmldir.files += $$PWD/qmldir qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH INSTALLS += target qmldir - -symbian { - # In Symbian, a library should enjoy _largest_ possible capability set. - TARGET.CAPABILITY = ALL -TCB - TARGET.UID3 = 0x20021313 - TARGET.EPOCALLOWDLLDATA=1 - # Specifies what files shall be deployed: the plugin itself and the qmldir file. - importFiles.sources = $$DESTDIR/declarative_multimedia$${QT_LIBINFIX}.dll qmldir - importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH - DEPLOYMENT = importFiles -} diff --git a/tests/auto/multimedia.pro b/tests/auto/multimedia.pro index c67a83817..aa3c7861b 100644 --- a/tests/auto/multimedia.pro +++ b/tests/auto/multimedia.pro @@ -42,7 +42,9 @@ contains (QT_CONFIG, declarative) { SUBDIRS += \ qsoundeffect \ qdeclarativeaudio \ - qdeclarativevideo + + + disabled:SUBDIRS += qdeclarativevideo } } |