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>
This commit is contained in:
committed by
Qt by Nokia
parent
4000a180dd
commit
342b8b9be5
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user