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/gstreamer/mediaplayer | |
| 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/gstreamer/mediaplayer')
| -rw-r--r-- | src/plugins/gstreamer/mediaplayer/mediaplayer.pro | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro index b986fc787..5ccf89bfd 100644 --- a/src/plugins/gstreamer/mediaplayer/mediaplayer.pro +++ b/src/plugins/gstreamer/mediaplayer/mediaplayer.pro @@ -1,9 +1,5 @@ TARGET = gstmediaplayer -PLUGIN_TYPE = mediaservice -PLUGIN_CLASS_NAME = QGstreamerPlayerServicePlugin -load(qt_plugin) - include(../common.pri) INCLUDEPATH += $$PWD @@ -28,3 +24,7 @@ SOURCES += \ OTHER_FILES += \ mediaplayer.json + +PLUGIN_TYPE = mediaservice +PLUGIN_CLASS_NAME = QGstreamerPlayerServicePlugin +load(qt_plugin) |