diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2024-03-13 09:23:55 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-20 15:19:49 +0000 |
| commit | b280c7f5e04c893506ff56bfe2d7534ae90e969a (patch) | |
| tree | bd86ea616b3a05c7c5d143bef0807c4a99b7f825 | |
| parent | aefb955d1538536e25b218e2f1a58d3ecdc3b932 (diff) | |
Add a proper guarding of windows related includes
Guard the QWindowsMediaDevices usage with the 'wmf' feature, since
the feature is not necessarly present on all windows platforms.
Pick-to: 6.5
Fixes: QTBUG-123215
Change-Id: Ib1faa52ad04535726eb65a4bfb4e60b96029de76
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit f5bd35a2eeb11b7a8f7f9a4230f1c3c5dc79c5ee)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 9f2ad26df34e1e291ef46c54c791ea8fa46e77af)
| -rw-r--r-- | src/multimedia/platform/qplatformmediadevices.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/platform/qplatformmediadevices.cpp b/src/multimedia/platform/qplatformmediadevices.cpp index 484886f44..a6029228d 100644 --- a/src/multimedia/platform/qplatformmediadevices.cpp +++ b/src/multimedia/platform/qplatformmediadevices.cpp @@ -12,7 +12,7 @@ #include <qandroidmediadevices_p.h> #elif defined(Q_OS_DARWIN) #include <qdarwinmediadevices_p.h> -#elif defined(Q_OS_WINDOWS) +#elif defined(Q_OS_WINDOWS) && QT_CONFIG(wmf) #include <qwindowsmediadevices_p.h> #elif QT_CONFIG(alsa) #include <qalsamediadevices_p.h> @@ -31,7 +31,7 @@ std::unique_ptr<QPlatformMediaDevices> QPlatformMediaDevices::create() { #ifdef Q_OS_DARWIN return std::make_unique<QDarwinMediaDevices>(); -#elif defined(Q_OS_WINDOWS) +#elif defined(Q_OS_WINDOWS) && QT_CONFIG(wmf) return std::make_unique<QWindowsMediaDevices>(); #elif defined(Q_OS_ANDROID) return std::make_unique<QAndroidMediaDevices>(); |