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/videonode | |
| 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/videonode')
| -rw-r--r-- | src/plugins/videonode/egl/egl.pro | 11 | ||||
| -rw-r--r-- | src/plugins/videonode/imx6/imx6.pro | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/plugins/videonode/egl/egl.pro b/src/plugins/videonode/egl/egl.pro index a6256cea1..7151123ea 100644 --- a/src/plugins/videonode/egl/egl.pro +++ b/src/plugins/videonode/egl/egl.pro @@ -1,12 +1,8 @@ TARGET = eglvideonode + QT += multimedia-private qtmultimediaquicktools-private CONFIG += egl -PLUGIN_TYPE=video/videonode -PLUGIN_EXTENDS = quick -PLUGIN_CLASS_NAME = QSGVideoNodeFactory_EGL -load(qt_plugin) - HEADERS += \ qsgvideonode_egl.h @@ -15,3 +11,8 @@ SOURCES += \ OTHER_FILES += \ egl.json + +PLUGIN_TYPE = video/videonode +PLUGIN_EXTENDS = quick +PLUGIN_CLASS_NAME = QSGVideoNodeFactory_EGL +load(qt_plugin) diff --git a/src/plugins/videonode/imx6/imx6.pro b/src/plugins/videonode/imx6/imx6.pro index 36e25e86b..c8085a31e 100644 --- a/src/plugins/videonode/imx6/imx6.pro +++ b/src/plugins/videonode/imx6/imx6.pro @@ -1,10 +1,6 @@ TARGET = imx6vivantevideonode -QT += multimedia-private qtmultimediaquicktools-private -PLUGIN_TYPE=video/videonode -PLUGIN_EXTENDS = quick -PLUGIN_CLASS_NAME = QSGVivanteVideoNodeFactory -load(qt_plugin) +QT += multimedia-private qtmultimediaquicktools-private HEADERS += \ qsgvivantevideonode.h \ @@ -20,3 +16,8 @@ SOURCES += \ OTHER_FILES += \ imx6.json + +PLUGIN_TYPE = video/videonode +PLUGIN_EXTENDS = quick +PLUGIN_CLASS_NAME = QSGVivanteVideoNodeFactory +load(qt_plugin) |