diff options
| -rw-r--r-- | src/multimedia/configure.cmake | 13 | ||||
| -rw-r--r-- | src/plugins/multimedia/gstreamer/CMakeLists.txt | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/multimedia/configure.cmake b/src/multimedia/configure.cmake index 5e6682f21..e6053d1e6 100644 --- a/src/multimedia/configure.cmake +++ b/src/multimedia/configure.cmake @@ -101,12 +101,7 @@ qt_feature("evr" PUBLIC PRIVATE ) qt_feature("gstreamer_1_0" PRIVATE LABEL "GStreamer 1.0" - CONDITION ( LINUX AND GStreamer_FOUND ) - ENABLE INPUT_gstreamer STREQUAL 'yes' - DISABLE INPUT_gstreamer STREQUAL 'no' -) -qt_feature("gstreamer" PRIVATE - CONDITION QT_FEATURE_gstreamer_1_0 + CONDITION GStreamer_FOUND ) qt_feature("gstreamer_app" PRIVATE LABEL "GStreamer App" @@ -120,6 +115,12 @@ qt_feature("gstreamer_gl" PRIVATE LABEL "GStreamer OpenGL" CONDITION QT_FEATURE_opengl AND QT_FEATURE_gstreamer_1_0 AND GStreamer_Gl_FOUND AND EGL_FOUND ) +qt_feature("gstreamer" PRIVATE + LABEL "QtMM GStreamer plugin" + CONDITION (QT_FEATURE_gstreamer_1_0 AND QT_FEATURE_gstreamer_gl AND QT_FEATURE_gstreamer_app) + ENABLE INPUT_gstreamer STREQUAL 'yes' + DISABLE INPUT_gstreamer STREQUAL 'no' +) qt_feature("gpu_vivante" PRIVATE LABEL "Vivante GPU" diff --git a/src/plugins/multimedia/gstreamer/CMakeLists.txt b/src/plugins/multimedia/gstreamer/CMakeLists.txt index d37151bf2..f7ffb612b 100644 --- a/src/plugins/multimedia/gstreamer/CMakeLists.txt +++ b/src/plugins/multimedia/gstreamer/CMakeLists.txt @@ -56,7 +56,7 @@ qt_internal_add_plugin(QGstreamerMediaPlugin qt_internal_extend_target(QGstreamerMediaPlugin CONDITION QT_FEATURE_gstreamer_photography LIBRARIES - -lgstphotography-1.0 + GStreamer::Photography ) qt_internal_extend_target(QGstreamerMediaPlugin CONDITION QT_FEATURE_gstreamer_gl |