diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:27 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:51:09 +0100 |
commit | e964e89331f2cfef99a3f63172a127b6c02a9727 (patch) | |
tree | 4c7d78573d17e523e4278027cee8fa88494366c8 /src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp | |
parent | f09d36708fdab70ad51af374a65ddded64525f67 (diff) | |
parent | 6f7192a048432e4792330244b74a2a39ccd8d515 (diff) |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/plugins/gstreamer/camerabin/camerabincontainer.h
Change-Id: I4942d41d69112335fe0c994002f1b32ef3aad051
Diffstat (limited to 'src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp')
-rw-r--r-- | src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp index d7798b1b7..db266a10e 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayerserviceplugin.cpp @@ -37,6 +37,7 @@ ** ****************************************************************************/ +#include <QtMultimedia/private/qtmultimediaglobal_p.h> #include <QtCore/qstring.h> #include <QtCore/qdebug.h> #include <QtCore/QDir> @@ -70,7 +71,7 @@ QMediaServiceProviderHint::Features QGstreamerPlayerServicePlugin::supportedFeat { if (service == Q_MEDIASERVICE_MEDIAPLAYER) return -#ifdef HAVE_GST_APPSRC +#if QT_CONFIG(gstreamer_app) QMediaServiceProviderHint::StreamPlayback | #endif QMediaServiceProviderHint::VideoSurface; |