diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:17:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-07 21:17:53 +0100 |
| commit | 06a9505327f1c8aee70d701037b2cdcc4fc143f6 (patch) | |
| tree | 242cec89d49078e912343afa8fc1ff92c7a8c2db /src/plugins/avfoundation | |
| parent | 9500aadc219481d89d32e5c2a2de10b0740c50de (diff) | |
| parent | 3198bf4944edd8f25996c2b4c4516f606165af59 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/avfoundation/mediaplayer/mediaplayer.pro
tests/auto/unit/qmediaserviceprovider/mockserviceplugin1/mockserviceplugin1.pro
tests/auto/unit/qmediaserviceprovider/mockserviceplugin2/mockserviceplugin2.pro
tests/auto/unit/qmediaserviceprovider/mockserviceplugin3/mockserviceplugin3.pro
tests/auto/unit/qmediaserviceprovider/mockserviceplugin4/mockserviceplugin4.pro
tests/auto/unit/qmediaserviceprovider/mockserviceplugin5/mockserviceplugin5.pro
Change-Id: I5742596230dc510ba2a09eba624429bb67179194
Diffstat (limited to 'src/plugins/avfoundation')
| -rw-r--r-- | src/plugins/avfoundation/camera/camera.pro | 11 | ||||
| -rw-r--r-- | src/plugins/avfoundation/mediaplayer/mediaplayer.pro | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/plugins/avfoundation/camera/camera.pro b/src/plugins/avfoundation/camera/camera.pro index a82d88ded..8563eb655 100644 --- a/src/plugins/avfoundation/camera/camera.pro +++ b/src/plugins/avfoundation/camera/camera.pro @@ -1,13 +1,10 @@ +TARGET = qavfcamera + # Avoid clash with a variable named `slots' in a Quartz header CONFIG += no_keywords -TARGET = qavfcamera QT += multimedia-private network -PLUGIN_TYPE = mediaservice -PLUGIN_CLASS_NAME = AVFServicePlugin -load(qt_plugin) - LIBS += -framework AudioToolbox \ -framework CoreAudio \ -framework QuartzCore \ @@ -79,3 +76,7 @@ OBJECTIVE_SOURCES += avfcamerazoomcontrol.mm \ avfmediarecordercontrol_ios.mm } + +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = AVFServicePlugin +load(qt_plugin) diff --git a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro index 8b5f14b4e..779d5ff2d 100644 --- a/src/plugins/avfoundation/mediaplayer/mediaplayer.pro +++ b/src/plugins/avfoundation/mediaplayer/mediaplayer.pro @@ -1,16 +1,11 @@ -load(qt_build_config) +TARGET = qavfmediaplayer #DEFINES += QT_DEBUG_AVF # Avoid clash with a variable named `slots' in a Quartz header CONFIG += no_keywords -TARGET = qavfmediaplayer QT += multimedia-private network -PLUGIN_TYPE = mediaservice -PLUGIN_CLASS_NAME = AVFMediaPlayerServicePlugin -load(qt_plugin) - LIBS += -framework AVFoundation -framework CoreMedia -framework CoreVideo -framework QuartzCore DEFINES += QMEDIA_AVF_MEDIAPLAYER @@ -75,3 +70,7 @@ ios|tvos { OTHER_FILES += \ avfmediaplayer.json + +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = AVFMediaPlayerServicePlugin +load(qt_plugin) |