diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-02-18 14:04:56 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-04 11:47:30 +0100 |
commit | e85a581c518f11fcf9080ba356a4538a23f04212 (patch) | |
tree | ba19f912ea13e6b83782e4fd8731aa1f7f5fd149 /patches | |
parent | 970ccc7f1e7890f4ac49b761678274823576aca5 (diff) |
Add Qt clipboard integration
The GTK clipboard integration isn't working for us and we need a way
to get clipboard requests from the renderer into the system clipboard.
This patch adds a Qt implementation to let Qt handle the platform
abstraction, even though the Chromium clipboard direct integration
could work on some platforms.
Change-Id: Ie7af5c6b4c662fc8f4109b2e85e9f594d6d90b0d
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/chromium/0018-Update-clipboard.h-to-allow-building-clipboard_qt.cp.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/patches/chromium/0018-Update-clipboard.h-to-allow-building-clipboard_qt.cp.patch b/patches/chromium/0018-Update-clipboard.h-to-allow-building-clipboard_qt.cp.patch new file mode 100644 index 000000000..d8e6c5c90 --- /dev/null +++ b/patches/chromium/0018-Update-clipboard.h-to-allow-building-clipboard_qt.cp.patch @@ -0,0 +1,44 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jocelyn Turcotte <jocelyn.turcotte@digia.com> +Date: Tue, 18 Feb 2014 14:49:48 +0100 +Subject: Update clipboard.h to allow building clipboard_qt.cpp on all + platforms + +Change-Id: Ife754b2fcb1c1a535565facdbab615c07b8c4935 +Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> +--- + ui/base/clipboard/clipboard.h | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/ui/base/clipboard/clipboard.h b/ui/base/clipboard/clipboard.h +index 94cd664..4e4791d 100644 +--- a/ui/base/clipboard/clipboard.h ++++ b/ui/base/clipboard/clipboard.h +@@ -87,6 +87,7 @@ class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) { + bool operator<(const FormatType& other) const; + #endif + ++#if !defined(TOOLKIT_QT) + #if defined(OS_WIN) + const FORMATETC& ToFormatEtc() const { return data_; } + #elif defined(OS_MACOSX) +@@ -96,6 +97,7 @@ class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) { + #elif defined(USE_AURA) + const std::string& ToString() const { return data_; } + #endif ++#endif // TOOLKIT_QT + + private: + friend class Clipboard; +@@ -110,7 +112,10 @@ class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) { + // + // Note that in some cases, the accessor for the wrapped descriptor may be + // public, as these format types can be used by drag and drop code as well. +-#if defined(OS_WIN) ++#if defined(TOOLKIT_QT) ++ explicit FormatType(const std::string& native_format); ++ std::string data_; ++#elif defined(OS_WIN) + explicit FormatType(UINT native_format); + FormatType(UINT native_format, LONG index); + UINT ToUINT() const { return data_.cfFormat; } |