diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2011-07-15 15:49:49 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-15 08:58:44 +0200 |
| commit | 7085775a115421e5fbecc02679da1558c5178e84 (patch) | |
| tree | cd4fe3bc90b3ff33751ea62fec92fe241ab9ad67 /src/imports | |
| parent | 09d89118d973f427ed418047a2b404c45a552d83 (diff) | |
Prepare for QtQuick2 based declarative elements.
Disable the QDeclarativeItem based components until they are ported
to scenegraph, and bump the revision to 4.0 (Once things are final,
we can make it 5.0).
Change-Id: Ib9c064722b80c38e711fbadc66966597c14a2b1a
Reviewed-on: http://codereview.qt.nokia.com/1685
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/multimedia/multimedia.cpp | 13 | ||||
| -rw-r--r-- | src/imports/multimedia/multimedia.pro | 25 |
2 files changed, 19 insertions, 19 deletions
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 -} |