From bb174833724aa009b9b0fac37b2bb72916fa8e34 Mon Sep 17 00:00:00 2001 From: Martin Negyokru Date: Tue, 29 Nov 2022 16:53:57 +0100 Subject: Adapt PointerDevice for WebEngine Guard out pointer_device implementations as we override them in: https://codereview.qt-project.org/c/qt/qtwebengine/+/439924 Task-number: QTBUG-63174 Change-Id: Ic51f694139ab1bf403f16c55d458218169ca1ace Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/446174 Reviewed-by: Allan Sandfeld Jensen --- chromium/ui/base/BUILD.gn | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/chromium/ui/base/BUILD.gn b/chromium/ui/base/BUILD.gn index a14fdb6f99a..35bc19296e8 100644 --- a/chromium/ui/base/BUILD.gn +++ b/chromium/ui/base/BUILD.gn @@ -428,18 +428,20 @@ jumbo_component("base") { sources += [ "accelerators/media_keys_listener_stub.cc" ] } - if (is_win) { - sources += [ "pointer/pointer_device_win.cc" ] - } else if (is_android) { - sources += [ "pointer/pointer_device_android.cc" ] - } else if (is_ios) { - sources += [ "pointer/pointer_device_ios.cc" ] - } else if (is_linux || is_chromeos) { - sources += [ "pointer/pointer_device_linux.cc" ] - } else { - # Empty implementation for all other cases. - sources += [ "pointer/pointer_device.cc" ] - sources -= [ "pointer/pointer_device_util.cc" ] + if (!use_qt) { + if (is_win) { + sources += [ "pointer/pointer_device_win.cc" ] + } else if (is_android) { + sources += [ "pointer/pointer_device_android.cc" ] + } else if (is_ios) { + sources += [ "pointer/pointer_device_ios.cc" ] + } else if (is_linux || is_chromeos) { + sources += [ "pointer/pointer_device_linux.cc" ] + } else { + # Empty implementation for all other cases. + sources += [ "pointer/pointer_device.cc" ] + sources -= [ "pointer/pointer_device_util.cc" ] + } } if (is_fuchsia) { -- cgit v1.2.1