From 51c16e6c80d99c0a1ddcf72861e78d5db2a343d4 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 3 Feb 2022 12:44:01 +0000 Subject: Revert "Find GIO like qtbase does" This reverts commit cce03b277715210d152d714a7f46ce7947c812d3. Reason for revert: Only working in 6.3 and dev Change-Id: I4fc1fcaabab6b5f21655980d67e77ed3a6b61181 Fixes: QTBUG-100435 Reviewed-by: Samuli Piippo --- src/core/api/configure.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/api/configure.cmake b/src/core/api/configure.cmake index cbd21fca4..3eb2c5402 100644 --- a/src/core/api/configure.cmake +++ b/src/core/api/configure.cmake @@ -1,11 +1,11 @@ #### Libraries if(NOT QT_CONFIGURE_RUNNING) - find_package(GLIB2 COMPONENTS gio) find_package(PkgConfig) 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() @@ -109,7 +109,7 @@ qt_feature("webengine-webrtc-pipewire" PRIVATE LABEL "PipeWire over GIO" PURPOSE "Provides PipeWire support in WebRTC using GIO." AUTODETECT false - CONDITION QT_FEATURE_webengine_webrtc AND TARGET GLIB2::GIO + CONDITION QT_FEATURE_webengine_webrtc AND GIO_FOUND ) qt_feature("webengine-full-debug-info" PRIVATE SECTION "WebEngine" -- cgit v1.2.3