diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-11 17:18:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-11 18:34:14 +0200 |
| commit | 6c2a111f8c82b56388abf409a61a3e0d56a52156 (patch) | |
| tree | 0f5a7ad320f034233c065fc994980b10afe434ad /src/core/core_gyp_generator.pro | |
| parent | c4fc323d0771e24ae726065cdce9eafef2c09c41 (diff) | |
| parent | d6e3ba85138a6147b9b34a1c3363b2d3b20ba284 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib010ede9756fb02992a3276ae7ec90ef1ab56a00
Diffstat (limited to 'src/core/core_gyp_generator.pro')
| -rw-r--r-- | src/core/core_gyp_generator.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro index 3e6a9eac0..cdff4ed64 100644 --- a/src/core/core_gyp_generator.pro +++ b/src/core/core_gyp_generator.pro @@ -73,6 +73,7 @@ SOURCES = \ render_widget_host_view_qt.cpp \ renderer/content_renderer_client_qt.cpp \ renderer/pepper/pepper_flash_browser_host_qt.cpp \ + renderer/pepper/pepper_flash_clipboard_message_filter_qt.cpp \ renderer/pepper/pepper_flash_renderer_host_qt.cpp \ renderer/pepper/pepper_host_factory_qt.cpp \ renderer/pepper/pepper_isolated_file_system_message_filter.cpp \ @@ -155,6 +156,7 @@ HEADERS = \ render_widget_host_view_qt_delegate.h \ renderer/content_renderer_client_qt.h \ renderer/pepper/pepper_flash_browser_host_qt.h \ + renderer/pepper/pepper_flash_clipboard_message_filter_qt.h \ renderer/pepper/pepper_flash_renderer_host_qt.h \ renderer/pepper/pepper_host_factory_qt.h \ renderer/pepper/pepper_isolated_file_system_message_filter.h \ |