diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-10-24 15:33:02 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-05 14:01:31 +0100 |
commit | 0affd9023ff1146c822cd188612c7727947ea618 (patch) | |
tree | 3e1f3efed0801fe275beff7511f45b9d856e9df5 /src | |
parent | 9dbcbc0b2f4a932a1f68572135de44124bab064c (diff) |
adjust to qt_plugin.prf changes
DESTDIR and INSTALLS+=target are set up automatically now. note that in
the qmediaserviceprovider test we must override that.
also, TARGET munging is done automatically.
Change-Id: Ida5d5601e22b099134d1ec07ace713e0d0986bd6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/audiocapture/audiocapture.pro | 6 | ||||
-rw-r--r-- | src/plugins/avfoundation/camera/camera.pro | 5 | ||||
-rw-r--r-- | src/plugins/avfoundation/mediaplayer/mediaplayer.pro | 5 | ||||
-rw-r--r-- | src/plugins/blackberry/mediaservice/mediaservice.pro | 6 | ||||
-rw-r--r-- | src/plugins/directshow/directshow.pro | 9 | ||||
-rw-r--r-- | src/plugins/gstreamer/audiodecoder/audiodecoder.pro | 6 | ||||
-rw-r--r-- | src/plugins/gstreamer/camerabin/camerabin.pro | 8 | ||||
-rw-r--r-- | src/plugins/gstreamer/mediacapture/mediacapture.pro | 6 | ||||
-rw-r--r-- | src/plugins/gstreamer/mediaplayer/mediaplayer.pro | 6 | ||||
-rw-r--r-- | src/plugins/m3u/m3u.pro | 7 | ||||
-rw-r--r-- | src/plugins/pulseaudio/pulseaudio.pro | 6 | ||||
-rw-r--r-- | src/plugins/qt7/qt7.pro | 5 | ||||
-rw-r--r-- | src/plugins/v4l/v4l.pro | 6 | ||||
-rw-r--r-- | src/plugins/wmf/wmf.pro | 7 |
14 files changed, 12 insertions, 76 deletions
diff --git a/src/plugins/audiocapture/audiocapture.pro b/src/plugins/audiocapture/audiocapture.pro index aef7b5e92..f58f43eab 100644 --- a/src/plugins/audiocapture/audiocapture.pro +++ b/src/plugins/audiocapture/audiocapture.pro @@ -1,9 +1,8 @@ TARGET = qtmedia_audioengine QT += multimedia-private -PLUGIN_TYPE=mediaservice +PLUGIN_TYPE=mediaservice load(qt_plugin) -DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} HEADERS += audioencodercontrol.h \ audiocontainercontrol.h \ @@ -23,8 +22,5 @@ SOURCES += audioencodercontrol.cpp \ audiocapturesession.cpp \ audiocaptureprobecontrol.cpp -target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target - OTHER_FILES += \ audiocapture.json diff --git a/src/plugins/avfoundation/camera/camera.pro b/src/plugins/avfoundation/camera/camera.pro index 0ca18c532..2eced1819 100644 --- a/src/plugins/avfoundation/camera/camera.pro +++ b/src/plugins/avfoundation/camera/camera.pro @@ -5,18 +5,13 @@ TARGET = qavfcamera QT += multimedia-private network PLUGIN_TYPE = mediaservice - load(qt_plugin) -DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} LIBS += -framework AppKit -framework AudioUnit \ -framework AudioToolbox -framework CoreAudio \ -framework QuartzCore -framework AVFoundation \ -framework CoreMedia -target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target - OTHER_FILES += avfcamera.json DEFINES += QMEDIA_AVF_CAMERA diff --git a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro index ae320ac1f..45a30acf2 100644 --- a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro +++ b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro @@ -8,15 +8,10 @@ TARGET = qavfmediaplayer QT += multimedia-private network PLUGIN_TYPE = mediaservice - load(qt_plugin) -DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} LIBS += -framework AVFoundation -framework CoreMedia -target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target - DEFINES += QMEDIA_AVF_MEDIAPLAYER HEADERS += \ diff --git a/src/plugins/blackberry/mediaservice/mediaservice.pro b/src/plugins/blackberry/mediaservice/mediaservice.pro index 52a7f6556..4b07c6c99 100644 --- a/src/plugins/blackberry/mediaservice/mediaservice.pro +++ b/src/plugins/blackberry/mediaservice/mediaservice.pro @@ -3,9 +3,8 @@ QT += multimedia-private gui-private CONFIG += no_private_qt_headers_warning PLUGIN_TYPE=mediaservice - load(qt_plugin) -DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} + LIBS += -lmmrndclient -lstrm -lscreen HEADERS += \ @@ -28,6 +27,3 @@ SOURCES += \ } OTHER_FILES += blackberry_mediaservice.json - -target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro index fe00883dc..97f28342e 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -1,9 +1,7 @@ -TEMPLATE = lib - -CONFIG += plugin -TARGET = $$qtLibraryTarget(dsengine) +TARGET = dsengine PLUGIN_TYPE=mediaservice +load(qt_plugin) QT += multimedia @@ -24,8 +22,5 @@ win32-g++ { !config_wmf: include(player/player.pri) include(camera/camera.pri) -target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target - OTHER_FILES += \ directshow.json diff --git a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro index 0e0209007..e559f7e02 100644 --- a/src/plugins/gstreamer/audiodecoder/audiodecoder.pro +++ b/src/plugins/gstreamer/audiodecoder/audiodecoder.pro @@ -1,8 +1,7 @@ TARGET = gstaudiodecoder -PLUGIN_TYPE = mediaservice +PLUGIN_TYPE = mediaservice load(qt_plugin) -DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} include(../common.pri) @@ -20,9 +19,6 @@ SOURCES += \ $$PWD/qgstreameraudiodecodersession.cpp \ $$PWD/qgstreameraudiodecoderserviceplugin.cpp -target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target - OTHER_FILES += \ audiodecoder.json diff --git a/src/plugins/gstreamer/camerabin/camerabin.pro b/src/plugins/gstreamer/camerabin/camerabin.pro index 75c948f40..5a2dde161 100644 --- a/src/plugins/gstreamer/camerabin/camerabin.pro +++ b/src/plugins/gstreamer/camerabin/camerabin.pro @@ -1,10 +1,9 @@ TARGET = gstcamerabin -PLUGIN_TYPE = mediaservice QT += multimedia-private +PLUGIN_TYPE = mediaservice load(qt_plugin) -DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} include(../common.pri) @@ -77,11 +76,6 @@ have_gst_photography { DEFINES += GST_USE_UNSTABLE_API #prevents warnings because of unstable photography API } - - -target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target - OTHER_FILES += \ camerabin.json diff --git a/src/plugins/gstreamer/mediacapture/mediacapture.pro b/src/plugins/gstreamer/mediacapture/mediacapture.pro index d9feb811f..9c6cc3c5a 100644 --- a/src/plugins/gstreamer/mediacapture/mediacapture.pro +++ b/src/plugins/gstreamer/mediacapture/mediacapture.pro @@ -1,8 +1,7 @@ TARGET = gstmediacapture -PLUGIN_TYPE = mediaservice +PLUGIN_TYPE = mediaservice load(qt_plugin) -DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} include(../common.pri) @@ -34,9 +33,6 @@ SOURCES += $$PWD/qgstreamercaptureservice.cpp \ $$PWD/qgstreamerimageencode.cpp \ $$PWD/qgstreamercaptureserviceplugin.cpp -target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target - # Camera usage with gstreamer needs to have #CONFIG += use_gstreamer_camera diff --git a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro index eab084394..70e5c8d0b 100644 --- a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro +++ b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro @@ -1,8 +1,7 @@ TARGET = gstmediaplayer -PLUGIN_TYPE = mediaservice +PLUGIN_TYPE = mediaservice load(qt_plugin) -DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} include(../common.pri) @@ -26,9 +25,6 @@ SOURCES += \ $$PWD/qgstreameravailabilitycontrol.cpp \ $$PWD/qgstreamerplayerserviceplugin.cpp -target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target - OTHER_FILES += \ mediaplayer.json diff --git a/src/plugins/m3u/m3u.pro b/src/plugins/m3u/m3u.pro index ccf1687d7..875e815c1 100644 --- a/src/plugins/m3u/m3u.pro +++ b/src/plugins/m3u/m3u.pro @@ -1,16 +1,11 @@ TARGET = qtmultimedia_m3u QT += multimedia-private -PLUGIN_TYPE=playlistformats +PLUGIN_TYPE=playlistformats load(qt_plugin) -DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} - HEADERS += qm3uhandler.h SOURCES += qm3uhandler.cpp -target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target - OTHER_FILES += \ m3u.json diff --git a/src/plugins/pulseaudio/pulseaudio.pro b/src/plugins/pulseaudio/pulseaudio.pro index 4a37c1a29..ac049dc21 100644 --- a/src/plugins/pulseaudio/pulseaudio.pro +++ b/src/plugins/pulseaudio/pulseaudio.pro @@ -1,9 +1,8 @@ TARGET = qtmedia_pulse QT += multimedia-private -PLUGIN_TYPE = audio +PLUGIN_TYPE = audio load(qt_plugin) -DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} CONFIG += link_pkgconfig PKGCONFIG += libpulse @@ -22,8 +21,5 @@ SOURCES += qpulseaudioplugin.cpp \ qpulseaudioengine.cpp \ qpulsehelpers.cpp -target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target - OTHER_FILES += \ pulseaudio.json diff --git a/src/plugins/qt7/qt7.pro b/src/plugins/qt7/qt7.pro index 5b1fcdbc4..4dba3fd5a 100644 --- a/src/plugins/qt7/qt7.pro +++ b/src/plugins/qt7/qt7.pro @@ -8,9 +8,7 @@ QT += multimedia-private network } PLUGIN_TYPE = mediaservice - load(qt_plugin) -DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} !simulator { QT += opengl @@ -68,8 +66,5 @@ OBJECTIVE_SOURCES += \ include(mediaplayer/mediaplayer.pri) -target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target - OTHER_FILES += \ qt7.json diff --git a/src/plugins/v4l/v4l.pro b/src/plugins/v4l/v4l.pro index 0eb985cc8..92c561947 100644 --- a/src/plugins/v4l/v4l.pro +++ b/src/plugins/v4l/v4l.pro @@ -1,14 +1,10 @@ TARGET = qtmedia_v4lengine QT += multimedia-private -PLUGIN_TYPE = mediaservice +PLUGIN_TYPE = mediaservice load(qt_plugin) -DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} HEADERS += v4lserviceplugin.h SOURCES += v4lserviceplugin.cpp include(radio/radio.pri) - -target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target diff --git a/src/plugins/wmf/wmf.pro b/src/plugins/wmf/wmf.pro index f22af94af..b9c2b4152 100644 --- a/src/plugins/wmf/wmf.pro +++ b/src/plugins/wmf/wmf.pro @@ -4,12 +4,10 @@ QT += multimedia-private network QT += multimediawidgets-private DEFINES += HAVE_WIDGETS } -PLUGIN_TYPE=mediaservice +PLUGIN_TYPE=mediaservice load(qt_plugin) -DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE} - DEPENDPATH += . INCLUDEPATH += . @@ -30,8 +28,5 @@ SOURCES += \ include (player/player.pri) include (decoder/decoder.pri) -target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE} -INSTALLS += target - OTHER_FILES += \ wmf.json |