summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-06-24 13:48:48 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-06-28 20:05:31 +0000
commit8bf3fb9d042502ddfc187e574c6f83a8994c8a41 (patch)
treed6f288948b6311dbe9c113f8480584f795bf4040 /src/core
parentb48d28392eda05167036ee53520dace310e33a96 (diff)
Add checks for xrandr and xdamage
Fixes: QTBUG-94759 Change-Id: Ie9a8fffc93fdf5564959965baae1ef9391f3307c Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit 13c62c0905d669bd4fd1ac151a82fe0232a92f13) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/core')
-rw-r--r--src/core/api/configure.cmake7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/core/api/configure.cmake b/src/core/api/configure.cmake
index 35d28e87f..e0332cab4 100644
--- a/src/core/api/configure.cmake
+++ b/src/core/api/configure.cmake
@@ -5,6 +5,7 @@ if(PkgConfig_FOUND)
pkg_check_modules(ALSA alsa IMPORTED_TARGET)
pkg_check_modules(PULSEAUDIO libpulse>=0.9.10 libpulse-mainloop-glib)
pkg_check_modules(GIO gio-2.0)
+ pkg_check_modules(XDAMAGE xdamage)
endif()
find_package(Qt6 ${PROJECT_VERSION} CONFIG QUIET OPTIONAL_COMPONENTS Positioning WebChannel PrintSupport)
@@ -99,6 +100,7 @@ qt_feature("webengine-webrtc" PRIVATE
LABEL "WebRTC"
PURPOSE "Provides WebRTC support."
AUTODETECT NOT QT_FEATURE_webengine_embedded_build
+ CONDITION XDAMAGE_FOUND OR NOT QT_FEATURE_webengine_ozone_x11
)
qt_feature("webengine-webrtc-pipewire" PRIVATE
LABEL "PipeWire over GIO"
@@ -153,3 +155,8 @@ qt_configure_add_report_entry(
MESSAGE "V8 snapshot cannot be built. Most likely, the 32-bit host compiler does not work. Please make sure you have 32-bit devel environment installed."
CONDITION UNIX AND cross_compile AND NOT QT_FEATURE_webengine_v8_snapshot_support
)
+qt_configure_add_report_entry(
+ TYPE WARNING
+ MESSAGE "WebRTC requires XDamage with qpa_xcb."
+ CONDITION QT_FEATURE_webengine_ozone_x11 AND NOT XDAMAGE_FOUND
+)