Skip to content

Commit d126280

Browse files
committed
CMake: remove obsolete evr feature from build system
evr (Enhanced Video Renderer) has a configure-time check, command line option and feature toggle, but this is unused: the windows platform plugin unconditionally uses evr. Removing this obsolete feature to clean things up. Pick-to: 6.8 6.9 Change-Id: I992303a230c9c58f6a2632330445f46709d829c9 Reviewed-by: Timur Pocheptsov <[email protected]>
1 parent 74bcb7d commit d126280

File tree

5 files changed

+1
-54
lines changed

5 files changed

+1
-54
lines changed

config.tests/evr/CMakeLists.txt

Lines changed: 0 additions & 33 deletions
This file was deleted.

config.tests/evr/main.cpp

Lines changed: 0 additions & 9 deletions
This file was deleted.

config_help.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ Multimedia options:
55
-no-gstreamer ........ Disable support for GStreamer
66
-gstreamer [version] . Enable GStreamer support [auto]
77
With no parameter, 1.0 is tried first, then 0.10.
8-
-evr ................. Enables EVR in WMF [auto]

src/multimedia/configure.cmake

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,6 @@ qt_find_package(VAAPI COMPONENTS VA DRM PROVIDED_TARGETS VAAPI::VAAPI MODULE_NAM
9191

9292
#### Tests
9393

94-
95-
qt_config_compile_test("evr"
96-
LABEL "evr.h"
97-
PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../config.tests/evr"
98-
)
99-
10094
qt_config_compile_test("gpu_vivante"
10195
LABEL "Vivante GPU"
10296
PROJECT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../config.tests/gpu_vivante"
@@ -160,10 +154,7 @@ qt_feature("videotoolbox" PUBLIC PRIVATE
160154
LABEL "VideoToolbox"
161155
CONDITION AVFoundation_FOUND
162156
)
163-
qt_feature("evr" PUBLIC PRIVATE
164-
LABEL "evr.h"
165-
CONDITION WIN32 AND TEST_evr
166-
)
157+
167158
qt_feature("gstreamer" PRIVATE
168159
LABEL "QtMM GStreamer plugin"
169160
CONDITION TARGET GStreamer::GStreamer AND TARGET GStreamer::App AND TARGET GStreamer::Play

src/multimedia/qt_cmdline.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# SPDX-License-Identifier: BSD-3-Clause
33

44
qt_commandline_option(alsa TYPE boolean)
5-
qt_commandline_option(evr TYPE boolean)
65
qt_commandline_option(wmf TYPE boolean)
76
qt_commandline_option(gstreamer TYPE optionalString VALUES no yes)
87
qt_commandline_option(pulseaudio TYPE boolean)

0 commit comments

Comments
 (0)