diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-29 12:45:10 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-20 13:50:53 +0100 |
| commit | 2d6f5dcfdbdf079b5a10e89934c0dd8a03c37974 (patch) | |
| tree | f4c44d1ac371d4b0efb775532aaddcec9912a3cf | |
| parent | d5b9325d34ad6466980baf4bce6c52abbb406643 (diff) | |
| download | qtwebengine-chromium-2d6f5dcfdbdf079b5a10e89934c0dd8a03c37974.tar.gz | |
Fix selection paste on Linux
Change-Id: Ib269a80077834c1aff73be75e16e2338c52e23a9
Fixes: QTBUG-71457
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| -rw-r--r-- | chromium/third_party/blink/renderer/core/clipboard/system_clipboard.cc | 3 | ||||
| -rw-r--r-- | chromium/ui/base/mojo/clipboard_blink_struct_traits.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chromium/third_party/blink/renderer/core/clipboard/system_clipboard.cc b/chromium/third_party/blink/renderer/core/clipboard/system_clipboard.cc index ac7e91263d3..0a3fbff7404 100644 --- a/chromium/third_party/blink/renderer/core/clipboard/system_clipboard.cc +++ b/chromium/third_party/blink/renderer/core/clipboard/system_clipboard.cc @@ -244,7 +244,8 @@ bool SystemClipboard::IsValidBufferType(mojom::ClipboardBuffer buffer) { case mojom::ClipboardBuffer::kStandard: return true; case mojom::ClipboardBuffer::kSelection: -#if defined(USE_X11) + // mirroring ui/base/clipboard/clipboard.h +#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS) return true; #else // Chrome OS and non-X11 unix builds do not support diff --git a/chromium/ui/base/mojo/clipboard_blink_struct_traits.h b/chromium/ui/base/mojo/clipboard_blink_struct_traits.h index 8a6cfc90820..57a46f843b1 100644 --- a/chromium/ui/base/mojo/clipboard_blink_struct_traits.h +++ b/chromium/ui/base/mojo/clipboard_blink_struct_traits.h @@ -27,7 +27,8 @@ struct EnumTraits<blink::mojom::ClipboardBuffer, ui::ClipboardType> { *out = ui::CLIPBOARD_TYPE_COPY_PASTE; return true; case blink::mojom::ClipboardBuffer::kSelection: -#if defined(USE_X11) + // mirroring ui/base/clipboard/clipboard.h +#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS) *out = ui::CLIPBOARD_TYPE_SELECTION; return true; #else |