diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-02 14:48:25 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-06-01 16:56:06 +0000 |
| commit | 4d61ba751088f650fe5d22bbf88036e80ff19f0f (patch) | |
| tree | a1583bd501cfd675655396775108a9b7b3881b95 /src/core/chrome_qt.gyp | |
| parent | 06a60e33c6101d725d8b88d4e3c647b9b2d3e7ab (diff) | |
Basic porting to Chromium 51
Trivial changes in methods, arguments and types.
Change-Id: Ic707c376249f816268223e696ed5f6251df1f85f
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/chrome_qt.gyp')
| -rw-r--r-- | src/core/chrome_qt.gyp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/core/chrome_qt.gyp b/src/core/chrome_qt.gyp index f2d7c5831..394e72733 100644 --- a/src/core/chrome_qt.gyp +++ b/src/core/chrome_qt.gyp @@ -2,8 +2,8 @@ 'variables': { 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 'chrome_spellchecker_sources': [ - '<(DEPTH)/base/prefs/testing_pref_store.cc', - '<(DEPTH)/base/prefs/testing_pref_store.h', + '<(DEPTH)/components/prefs/testing_pref_store.cc', + '<(DEPTH)/components/prefs/testing_pref_store.h', '<(DEPTH)/chrome/browser/spellchecker/feedback.cc', '<(DEPTH)/chrome/browser/spellchecker/feedback.h', '<(DEPTH)/chrome/browser/spellchecker/feedback_sender.cc', @@ -63,6 +63,7 @@ 'type': 'static_library', 'dependencies': [ 'chrome_resources', + '<(chromium_src_dir)/components/components_resources.gyp:components_resources', '<(chromium_src_dir)/components/components_strings.gyp:components_strings', ], 'include_dirs': [ @@ -70,9 +71,6 @@ '<(chromium_src_dir)', '<(chromium_src_dir)/skia/config', '<(chromium_src_dir)/third_party/skia/include/core', - # Needed to include grit-generated files in localized_error.cc: - '<(SHARED_INTERMEDIATE_DIR)/chrome', - '<(SHARED_INTERMEDIATE_DIR)/components/strings', ], 'sources': [ '<(DEPTH)/chrome/browser/media/desktop_media_list.h', @@ -80,8 +78,6 @@ '<(DEPTH)/chrome/browser/media/desktop_streams_registry.h', '<(DEPTH)/chrome/common/chrome_switches.cc', '<(DEPTH)/chrome/common/chrome_switches.h', - '<(DEPTH)/chrome/common/localized_error.cc', - '<(DEPTH)/chrome/common/localized_error.h', ], 'conditions': [ ['enable_spellcheck==1', { @@ -134,7 +130,7 @@ '<(DEPTH)/chrome/browser/printing/printer_query.h', ], 'dependencies': [ - '<(chromium_src_dir)/third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', + '<(chromium_src_dir)/mojo/mojo_public.gyp:mojo_cpp_bindings', ], 'include_dirs': [ '<(chromium_src_dir)/extensions', |