From d18eadc8ab567fd78ecf752678565fb334ea10fd Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 9 Jul 2012 19:01:15 +0200 Subject: use centralized qml plugin project handling Change-Id: If9561a27d9b96d020e2ffcf2dcc6deedb4d89e4a Reviewed-by: Friedemann Kleint Reviewed-by: Oswald Buddenhagen --- src/imports/multimedia/multimedia.pro | 37 ++--------------------------------- 1 file changed, 2 insertions(+), 35 deletions(-) (limited to 'src/imports/multimedia/multimedia.pro') diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index 45a0f7b6d..7c04c7e77 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -1,13 +1,5 @@ -TARGET = declarative_multimedia -TARGETPATH = QtMultimedia - -include(../qimportbase.pri) - QT += qml quick network multimedia-private -DESTDIR = $$QT.multimedia.imports/$$TARGETPATH -target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - LIBS += -lQtMultimediaQuick_p -L$$QT.multimedia.libs HEADERS += \ @@ -53,32 +45,7 @@ SOURCES += \ qdeclarativecamerapreviewprovider.cpp \ qdeclarativetorch.cpp -OTHER_FILES += \ +QML_FILES += \ Video.qml -# plugin.qmltypes is used by Qt Creator for syntax highlighting and the QML code model. It needs -# to be regenerated whenever the QML elements exported by the plugin change. This cannot be done -# automatically at compile time because qmlplugindump does not support some QML features and it may -# not be possible when cross-compiling. -# -# To regenerate run 'make qmltypes' which will update the plugins.qmltypes file in the source -# directory. Then review and commit the changes made to plugins.qmltypes. -# -# This will run the following command: -# qmlplugindump > plugins.qmltypes -# e.g.: -# qmlplugindump QtMultimedia 5.0 imports/QtMultimedia/libdeclarative_multimedia.so > plugins.qmltypes - -load(resolve_target) -qmltypes.target = qmltypes -qmltypes.commands = $$[QT_INSTALL_BINS]/qmlplugindump QtMultimedia 5.0 $$QMAKE_RESOLVED_TARGET > $$PWD/plugins.qmltypes -qmltypes.depends = $$QMAKE_RESOLVED_TARGET -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 -qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH - -INSTALLS += target qmldir +load(qml_plugin) -- cgit v1.2.3