diff options
| author | Michael Goddard <michael.goddard@nokia.com> | 2012-06-08 10:57:15 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-08 07:53:23 +0200 |
| commit | 342b8b9be5b804cd7e04b6e1aef0a9989c99bf56 (patch) | |
| tree | 4b0dd3eac6cb03d4ac2114b783e97a0874f6f1cd /src/imports/multimedia/multimedia.pro | |
| parent | 4000a180dd49357eb4dbf2700d5acb9b6a6f9696 (diff) | |
Remove the legacy QML API.
This means no version 4.0 (which was never released) and no
Qt.multimediakit alternative import.
Change-Id: Iaacf047b0d72381a4a8cd975e036135ed11ea383
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Diffstat (limited to 'src/imports/multimedia/multimedia.pro')
| -rw-r--r-- | src/imports/multimedia/multimedia.pro | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index 6803f6fd6..85908fa8e 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -29,10 +29,7 @@ HEADERS += \ qdeclarativecamerafocus_p.h \ qdeclarativecameraimageprocessing_p.h \ qdeclarativecamerapreviewprovider_p.h \ - qdeclarativetorch_p.h \ - qdeclarativeaudio_p_4.h \ - qdeclarativemediabase_p_4.h \ - qdeclarativemediametadata_p_4.h + qdeclarativetorch_p.h SOURCES += \ multimedia.cpp \ @@ -52,12 +49,9 @@ SOURCES += \ qdeclarativecamerafocus.cpp \ qdeclarativecameraimageprocessing.cpp \ qdeclarativecamerapreviewprovider.cpp \ - qdeclarativetorch.cpp \ - qdeclarativemediabase_4.cpp \ - qdeclarativeaudio_4.cpp + qdeclarativetorch.cpp OTHER_FILES += \ - Video_4.qml \ Video.qml # plugin.qmltypes is used by Qt Creator for syntax highlighting and the QML code model. It needs @@ -82,19 +76,7 @@ QMAKE_EXTRA_TARGETS += qmltypes # Tell qmake to create such makefile that qmldir, plugins.qmltypes and target # (i.e. declarative_multimedia) are all copied to $$[QT_INSTALL_IMPORTS]/QtMultimedia directory, -qmldir.files += $$PWD/qmldir $$PWD/plugins.qmltypes $$PWD/Video.qml $$PWD/Video_4.qml +qmldir.files += $$PWD/qmldir $$PWD/plugins.qmltypes $$PWD/Video.qml qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH -# another copy of the qmldir file so the old import works -OLDQMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir.qtmultimediakit -oldcopy2build.input = OLDQMLDIRFILE -oldcopy2build.output = $$QT.multimedia.imports/Qt/multimediakit/qmldir -!contains(TEMPLATE_PREFIX, vc):oldcopy2build.variable_out = PRE_TARGETDEPS -oldcopy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -oldcopy2build.name = COPY ${QMAKE_FILE_IN} -oldcopy2build.CONFIG += no_link -# `clean' should leave the build in a runnable state, which means it shouldn't delete qmldir -oldcopy2build.CONFIG += no_clean -QMAKE_EXTRA_COMPILERS += oldcopy2build - INSTALLS += target qmldir |