slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adjust to qt_plugin.prf changes

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen
2012-10-24 15:33:02 +02:00
committed by The Qt Project
parent 9dbcbc0b2f
commit 0affd9023f
18 changed files with 28 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/audiocapture/audiocapture.pro
View File

@@ -1,9 +1,8 @@
TARGET = qtmedia_audioengine TARGET = qtmedia_audioengine
QT += multimedia-private QT += multimedia-private
PLUGIN_TYPE=mediaservice
PLUGIN_TYPE=mediaservice
load(qt_plugin) load(qt_plugin)
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
HEADERS += audioencodercontrol.h \ HEADERS += audioencodercontrol.h \
audiocontainercontrol.h \ audiocontainercontrol.h \
@@ -23,8 +22,5 @@ SOURCES += audioencodercontrol.cpp \
audiocapturesession.cpp \ audiocapturesession.cpp \
audiocaptureprobecontrol.cpp audiocaptureprobecontrol.cpp
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
INSTALLS += target
OTHER_FILES += \ OTHER_FILES += \
audiocapture.json audiocapture.json

5
src/plugins/avfoundation/camera/camera.pro
View File

@@ -5,18 +5,13 @@ TARGET = qavfcamera
QT += multimedia-private network QT += multimedia-private network
PLUGIN_TYPE = mediaservice PLUGIN_TYPE = mediaservice
load(qt_plugin) load(qt_plugin)
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
LIBS += -framework AppKit -framework AudioUnit \ LIBS += -framework AppKit -framework AudioUnit \
-framework AudioToolbox -framework CoreAudio \ -framework AudioToolbox -framework CoreAudio \
-framework QuartzCore -framework AVFoundation \ -framework QuartzCore -framework AVFoundation \
-framework CoreMedia -framework CoreMedia
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
INSTALLS += target
OTHER_FILES += avfcamera.json OTHER_FILES += avfcamera.json
DEFINES += QMEDIA_AVF_CAMERA DEFINES += QMEDIA_AVF_CAMERA

5
src/plugins/avfoundation/mediaplayer/mediaplayer.pro
View File

@@ -8,15 +8,10 @@ TARGET = qavfmediaplayer
QT += multimedia-private network QT += multimedia-private network
PLUGIN_TYPE = mediaservice PLUGIN_TYPE = mediaservice
load(qt_plugin) load(qt_plugin)
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
LIBS += -framework AVFoundation -framework CoreMedia LIBS += -framework AVFoundation -framework CoreMedia
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
INSTALLS += target
DEFINES += QMEDIA_AVF_MEDIAPLAYER DEFINES += QMEDIA_AVF_MEDIAPLAYER
HEADERS += \ HEADERS += \

6
src/plugins/blackberry/mediaservice/mediaservice.pro
View File

@@ -3,9 +3,8 @@ QT += multimedia-private gui-private
CONFIG += no_private_qt_headers_warning CONFIG += no_private_qt_headers_warning
PLUGIN_TYPE=mediaservice PLUGIN_TYPE=mediaservice
load(qt_plugin) load(qt_plugin)
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
LIBS += -lmmrndclient -lstrm -lscreen LIBS += -lmmrndclient -lstrm -lscreen
HEADERS += \ HEADERS += \
@@ -28,6 +27,3 @@ SOURCES += \
} }
OTHER_FILES += blackberry_mediaservice.json OTHER_FILES += blackberry_mediaservice.json
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
INSTALLS += target

9
src/plugins/directshow/directshow.pro
View File

@@ -1,9 +1,7 @@
TEMPLATE = lib TARGET = dsengine
CONFIG += plugin
TARGET = $$qtLibraryTarget(dsengine)
PLUGIN_TYPE=mediaservice PLUGIN_TYPE=mediaservice
load(qt_plugin)
QT += multimedia QT += multimedia
@@ -24,8 +22,5 @@ win32-g++ {
!config_wmf: include(player/player.pri) !config_wmf: include(player/player.pri)
include(camera/camera.pri) include(camera/camera.pri)
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
INSTALLS += target
OTHER_FILES += \ OTHER_FILES += \
directshow.json directshow.json

6
src/plugins/gstreamer/audiodecoder/audiodecoder.pro
View File

@@ -1,8 +1,7 @@
TARGET = gstaudiodecoder TARGET = gstaudiodecoder
PLUGIN_TYPE = mediaservice
PLUGIN_TYPE = mediaservice
load(qt_plugin) load(qt_plugin)
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
include(../common.pri) include(../common.pri)
@@ -20,9 +19,6 @@ SOURCES += \
$$PWD/qgstreameraudiodecodersession.cpp \ $$PWD/qgstreameraudiodecodersession.cpp \
$$PWD/qgstreameraudiodecoderserviceplugin.cpp $$PWD/qgstreameraudiodecoderserviceplugin.cpp
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
INSTALLS += target
OTHER_FILES += \ OTHER_FILES += \
audiodecoder.json audiodecoder.json

8
src/plugins/gstreamer/camerabin/camerabin.pro
View File

@@ -1,10 +1,9 @@
TARGET = gstcamerabin TARGET = gstcamerabin
PLUGIN_TYPE = mediaservice
QT += multimedia-private QT += multimedia-private
PLUGIN_TYPE = mediaservice
load(qt_plugin) load(qt_plugin)
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
include(../common.pri) include(../common.pri)
@@ -77,11 +76,6 @@ have_gst_photography {
DEFINES += GST_USE_UNSTABLE_API #prevents warnings because of unstable photography API DEFINES += GST_USE_UNSTABLE_API #prevents warnings because of unstable photography API
} }
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
INSTALLS += target
OTHER_FILES += \ OTHER_FILES += \
camerabin.json camerabin.json

6
src/plugins/gstreamer/mediacapture/mediacapture.pro
View File

@@ -1,8 +1,7 @@
TARGET = gstmediacapture TARGET = gstmediacapture
PLUGIN_TYPE = mediaservice
PLUGIN_TYPE = mediaservice
load(qt_plugin) load(qt_plugin)
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
include(../common.pri) include(../common.pri)
@@ -34,9 +33,6 @@ SOURCES += $$PWD/qgstreamercaptureservice.cpp \
$$PWD/qgstreamerimageencode.cpp \ $$PWD/qgstreamerimageencode.cpp \
$$PWD/qgstreamercaptureserviceplugin.cpp $$PWD/qgstreamercaptureserviceplugin.cpp
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
INSTALLS += target
# Camera usage with gstreamer needs to have # Camera usage with gstreamer needs to have
#CONFIG += use_gstreamer_camera #CONFIG += use_gstreamer_camera

6
src/plugins/gstreamer/mediaplayer/mediaplayer.pro
View File

@@ -1,8 +1,7 @@
TARGET = gstmediaplayer TARGET = gstmediaplayer
PLUGIN_TYPE = mediaservice
PLUGIN_TYPE = mediaservice
load(qt_plugin) load(qt_plugin)
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
include(../common.pri) include(../common.pri)
@@ -26,9 +25,6 @@ SOURCES += \
$$PWD/qgstreameravailabilitycontrol.cpp \ $$PWD/qgstreameravailabilitycontrol.cpp \
$$PWD/qgstreamerplayerserviceplugin.cpp $$PWD/qgstreamerplayerserviceplugin.cpp
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
INSTALLS += target
OTHER_FILES += \ OTHER_FILES += \
mediaplayer.json mediaplayer.json

7
src/plugins/m3u/m3u.pro
View File

@@ -1,16 +1,11 @@
TARGET = qtmultimedia_m3u TARGET = qtmultimedia_m3u
QT += multimedia-private QT += multimedia-private
PLUGIN_TYPE=playlistformats PLUGIN_TYPE=playlistformats
load(qt_plugin) load(qt_plugin)
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
HEADERS += qm3uhandler.h HEADERS += qm3uhandler.h
SOURCES += qm3uhandler.cpp SOURCES += qm3uhandler.cpp
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
INSTALLS += target
OTHER_FILES += \ OTHER_FILES += \
m3u.json m3u.json

6
src/plugins/pulseaudio/pulseaudio.pro
View File

@@ -1,9 +1,8 @@
TARGET = qtmedia_pulse TARGET = qtmedia_pulse
QT += multimedia-private QT += multimedia-private
PLUGIN_TYPE = audio
PLUGIN_TYPE = audio
load(qt_plugin) load(qt_plugin)
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
PKGCONFIG += libpulse PKGCONFIG += libpulse
@@ -22,8 +21,5 @@ SOURCES += qpulseaudioplugin.cpp \
qpulseaudioengine.cpp \ qpulseaudioengine.cpp \
qpulsehelpers.cpp qpulsehelpers.cpp
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
INSTALLS += target
OTHER_FILES += \ OTHER_FILES += \
pulseaudio.json pulseaudio.json

5
src/plugins/qt7/qt7.pro
View File

@@ -8,9 +8,7 @@ QT += multimedia-private network
} }
PLUGIN_TYPE = mediaservice PLUGIN_TYPE = mediaservice
load(qt_plugin) load(qt_plugin)
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
!simulator { !simulator {
QT += opengl QT += opengl
@@ -68,8 +66,5 @@ OBJECTIVE_SOURCES += \
include(mediaplayer/mediaplayer.pri) include(mediaplayer/mediaplayer.pri)
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
INSTALLS += target
OTHER_FILES += \ OTHER_FILES += \
qt7.json qt7.json

6
src/plugins/v4l/v4l.pro
View File

@@ -1,14 +1,10 @@
TARGET = qtmedia_v4lengine TARGET = qtmedia_v4lengine
QT += multimedia-private QT += multimedia-private
PLUGIN_TYPE = mediaservice
PLUGIN_TYPE = mediaservice
load(qt_plugin) load(qt_plugin)
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
HEADERS += v4lserviceplugin.h HEADERS += v4lserviceplugin.h
SOURCES += v4lserviceplugin.cpp SOURCES += v4lserviceplugin.cpp
include(radio/radio.pri) include(radio/radio.pri)
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
INSTALLS += target

7
src/plugins/wmf/wmf.pro
View File

@@ -4,12 +4,10 @@ QT += multimedia-private network
QT += multimediawidgets-private QT += multimediawidgets-private
DEFINES += HAVE_WIDGETS DEFINES += HAVE_WIDGETS
} }
PLUGIN_TYPE=mediaservice PLUGIN_TYPE=mediaservice
load(qt_plugin) load(qt_plugin)
DESTDIR = $$QT.multimedia.plugins/$${PLUGIN_TYPE}
DEPENDPATH += . DEPENDPATH += .
INCLUDEPATH += . INCLUDEPATH += .
@@ -30,8 +28,5 @@ SOURCES += \
include (player/player.pri) include (player/player.pri)
include (decoder/decoder.pri) include (decoder/decoder.pri)
target.path += $$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
INSTALLS += target
OTHER_FILES += \ OTHER_FILES += \
wmf.json wmf.json

8
tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
View File

@@ -3,6 +3,8 @@ QT += multimedia-private
CONFIG += no_private_qt_headers_warning CONFIG += no_private_qt_headers_warning
PLUGIN_TYPE=mediaservice PLUGIN_TYPE=mediaservice
load(qt_plugin)
DESTDIR = ../$${PLUGIN_TYPE} DESTDIR = ../$${PLUGIN_TYPE}
win32 { win32 {
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
@@ -12,12 +14,10 @@ win32 {
} }
} }
load(qt_plugin)
HEADERS += ../mockservice.h HEADERS += ../mockservice.h
SOURCES += mockserviceplugin1.cpp SOURCES += mockserviceplugin1.cpp
OTHER_FILES += mockserviceplugin1.json OTHER_FILES += mockserviceplugin1.json
target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
INSTALLS += target
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

8
tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
View File

@@ -3,6 +3,8 @@ QT += multimedia-private
CONFIG += no_private_qt_headers_warning CONFIG += no_private_qt_headers_warning
PLUGIN_TYPE=mediaservice PLUGIN_TYPE=mediaservice
load(qt_plugin)
DESTDIR = ../$${PLUGIN_TYPE} DESTDIR = ../$${PLUGIN_TYPE}
win32 { win32 {
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
@@ -12,12 +14,10 @@ win32 {
} }
} }
load(qt_plugin)
HEADERS += ../mockservice.h HEADERS += ../mockservice.h
SOURCES += mockserviceplugin2.cpp SOURCES += mockserviceplugin2.cpp
OTHER_FILES += mockserviceplugin2.json OTHER_FILES += mockserviceplugin2.json
target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
INSTALLS += target
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

8
tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
View File

@@ -3,6 +3,8 @@ QT += multimedia-private
CONFIG += no_private_qt_headers_warning CONFIG += no_private_qt_headers_warning
PLUGIN_TYPE=mediaservice PLUGIN_TYPE=mediaservice
load(qt_plugin)
DESTDIR = ../$${PLUGIN_TYPE} DESTDIR = ../$${PLUGIN_TYPE}
win32 { win32 {
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
@@ -12,12 +14,10 @@ win32 {
} }
} }
load(qt_plugin)
HEADERS += ../mockservice.h HEADERS += ../mockservice.h
SOURCES += mockserviceplugin3.cpp SOURCES += mockserviceplugin3.cpp
OTHER_FILES += mockserviceplugin3.json OTHER_FILES += mockserviceplugin3.json
target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
INSTALLS += target
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

8
tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
View File

@@ -3,6 +3,8 @@ QT += multimedia-private
CONFIG += no_private_qt_headers_warning CONFIG += no_private_qt_headers_warning
PLUGIN_TYPE=mediaservice PLUGIN_TYPE=mediaservice
load(qt_plugin)
DESTDIR = ../$${PLUGIN_TYPE} DESTDIR = ../$${PLUGIN_TYPE}
win32 { win32 {
CONFIG(debug, debug|release) { CONFIG(debug, debug|release) {
@@ -12,12 +14,10 @@ win32 {
} }
} }
load(qt_plugin)
HEADERS += ../mockservice.h HEADERS += ../mockservice.h
SOURCES += mockserviceplugin4.cpp SOURCES += mockserviceplugin4.cpp
OTHER_FILES += mockserviceplugin4.json OTHER_FILES += mockserviceplugin4.json
target.path += $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE} target.path = $$[QT_INSTALL_TESTS]/tst_qmediaserviceprovider/$${PLUGIN_TYPE}
INSTALLS += target
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0