diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-05 15:44:36 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-17 13:24:43 +0000 |
| commit | f2534fcd7ed9d1d3b9e771c1036caed34814e78c (patch) | |
| tree | 1317b15f9012a999f56a603df3aea5eb735a2e41 | |
| parent | e6304895ce7a8e0238f497ec85a3969ff3919715 (diff) | |
FIXUP: Add extensions to Qt build and fix it up for building
Also remove feedback_private
Change-Id: I00bef976a03cd1d5ea949a5968af8dddbedbe30a
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| -rw-r--r-- | chromium/extensions/browser/api/BUILD.gn | 1 | ||||
| -rw-r--r-- | chromium/extensions/browser/browser_context_keyed_service_factories.cc | 2 | ||||
| -rw-r--r-- | chromium/extensions/common/api/schema.gni | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/chromium/extensions/browser/api/BUILD.gn b/chromium/extensions/browser/api/BUILD.gn index 50a379ef65f..3f3faab323e 100644 --- a/chromium/extensions/browser/api/BUILD.gn +++ b/chromium/extensions/browser/api/BUILD.gn @@ -160,6 +160,7 @@ source_set("api") { "//extensions/browser/api/bluetooth_low_energy", "//extensions/browser/api/bluetooth_socket", "//extensions/browser/api/cast_channel", + "//extensions/browser/api/feedback_private", "//extensions/browser/api/system_cpu", "//extensions/browser/api/system_display", "//extensions/browser/api/system_info", diff --git a/chromium/extensions/browser/browser_context_keyed_service_factories.cc b/chromium/extensions/browser/browser_context_keyed_service_factories.cc index 6346c8b19c4..dd79d942395 100644 --- a/chromium/extensions/browser/browser_context_keyed_service_factories.cc +++ b/chromium/extensions/browser/browser_context_keyed_service_factories.cc @@ -17,7 +17,9 @@ #include "extensions/browser/api/clipboard/clipboard_api.h" #include "extensions/browser/api/declarative_net_request/rules_monitor_service.h" #include "extensions/browser/api/display_source/display_source_event_router_factory.h" +#if !defined(TOOLKIT_QT) #include "extensions/browser/api/feedback_private/feedback_private_api.h" +#endif // !defined(TOOLKIT_QT) #include "extensions/browser/api/hid/hid_device_manager.h" #include "extensions/browser/api/idle/idle_manager_factory.h" #include "extensions/browser/api/management/management_api.h" diff --git a/chromium/extensions/common/api/schema.gni b/chromium/extensions/common/api/schema.gni index 0fe7fde9f84..f956d84ed29 100644 --- a/chromium/extensions/common/api/schema.gni +++ b/chromium/extensions/common/api/schema.gni @@ -80,6 +80,7 @@ if (use_qt) { "bluetooth_private.idl", "bluetooth_socket.idl", "cast_channel.idl", + "feedback_private.idl", "system_cpu.idl", "system_display.idl", "system_memory.idl", |