diff options
| author | Zoltan Arvai <zarvai@inf.u-szeged.hu> | 2014-03-13 10:56:44 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-14 10:10:50 +0100 |
| commit | c4c163b9ef0cf8a59f683aecf079cadf0e1505d8 (patch) | |
| tree | 0abbd348d7a2e49fe98bee662e2b7d38fdf06b32 | |
| parent | c47bc7986e3a158fcb505992df084372a4a0e3bf (diff) | |
Fix clipboard build on Windows
Add missing guard to clipboard.h.
Exclude unneeded Windows specific source files from build.
Change-Id: I40fbea35dc1721ddf4e9c184515d57428a7ffe4d
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | patches/chromium/0018-Update-clipboard.h-to-allow-building-clipboard_qt.cp.patch | 15 | ||||
| -rw-r--r-- | src/core/qtwebengine_extras.gypi | 2 |
2 files changed, 14 insertions, 3 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 index d8e6c5c90..5420fdb30 100644 --- 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 @@ -7,11 +7,11 @@ Subject: Update clipboard.h to allow building clipboard_qt.cpp on all Change-Id: Ife754b2fcb1c1a535565facdbab615c07b8c4935 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> --- - ui/base/clipboard/clipboard.h | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) + ui/base/clipboard/clipboard.h | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ui/base/clipboard/clipboard.h b/ui/base/clipboard/clipboard.h -index 94cd664..4e4791d 100644 +index 94cd664..87a5f01 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) { @@ -42,3 +42,12 @@ index 94cd664..4e4791d 100644 explicit FormatType(UINT native_format); FormatType(UINT native_format, LONG index); UINT ToUINT() const { return data_.cfFormat; } +@@ -351,7 +356,7 @@ class UI_EXPORT Clipboard : NON_EXPORTED_BASE(public base::ThreadChecker) { + void WriteData(const FormatType& format, + const char* data_data, + size_t data_len); +-#if defined(OS_WIN) ++#if !defined(TOOLKIT_QT) && defined(OS_WIN) + void WriteBitmapFromHandle(HBITMAP source_hbitmap, + const gfx::Size& size); + diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi index 53affa463..95c8f7ec1 100644 --- a/src/core/qtwebengine_extras.gypi +++ b/src/core/qtwebengine_extras.gypi @@ -9,6 +9,8 @@ ['exclude', 'base/clipboard/clipboard_gtk.cc$'], ['exclude', 'base/clipboard/clipboard_mac.mm$'], ['exclude', 'base/clipboard/clipboard_win.cc$'], + ['exclude', 'base/clipboard/clipboard_util_win\\.(cc|h)$'], + ['exclude', 'base/dragdrop/os_exchange_data_provider_win\\.(cc|h)$'], ['exclude', 'base/resource/resource_bundle_gtk.cc$'], ['exclude', 'base/resource/resource_bundle_mac.mm$'], ['exclude', 'base/resource/resource_bundle_win.cc$'], |