diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-01-18 17:27:25 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-19 17:10:22 +0000 |
| commit | cce03b277715210d152d714a7f46ce7947c812d3 (patch) | |
| tree | fc1e1cffbb1db1b39b40f0f6d77fe1825eaf3b2e | |
| parent | ae323c9280d3a81f1ba00e1a56cc9b541d7d4344 (diff) | |
Find GIO like qtbase does
Otherwise it can conflict and cause issue on reconfigure
Change-Id: I3e7756b4720bc5a1e82ef0f327b8c9dbc76667ec
Fixes: QTBUG-99669
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 0b6310bf48cfe9772be6ca2b51c685acce3f4ba6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/core/api/configure.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/api/configure.cmake b/src/core/api/configure.cmake index e79bbbae3..ce508b00f 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 GIO_FOUND + CONDITION QT_FEATURE_webengine_webrtc AND TARGET GLIB2::GIO ) qt_feature("webengine-full-debug-info" PRIVATE SECTION "WebEngine" |