diff options
| author | Martin Negyokru <negyokru@inf.u-szeged.hu> | 2022-11-29 16:53:57 +0100 |
|---|---|---|
| committer | Martin Negyokru <negyokru@inf.u-szeged.hu> | 2022-12-09 10:01:53 +0000 |
| commit | bb174833724aa009b9b0fac37b2bb72916fa8e34 (patch) | |
| tree | f48e05e834dbe2603de569a7cd6ec791b483a6d1 | |
| parent | 5e0bfdf8e8af2491687ff38774537b68e58f6dd5 (diff) | |
| download | qtwebengine-chromium-bb174833724aa009b9b0fac37b2bb72916fa8e34.tar.gz | |
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 <allan.jensen@qt.io>
| -rw-r--r-- | chromium/ui/base/BUILD.gn | 26 |
1 files 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) { |