diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-01 15:54:16 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-07-27 15:19:49 +0000 |
commit | b6a0cd76dbb29e288bb041aca3125801126f8810 (patch) | |
tree | f732665e9f9368adf787926798a7f2a44b669e32 /src/core/resources | |
parent | 808ca6e6917cf17e4c30fcd3ac609164b36594cc (diff) |
Move core_generated.gyp to build directory
Changes core_generated.gyp from being generated in the source directory
to being generated in the build directory.
Task-number: QTBUG-43014
Change-Id: Ia67df47bfadbf5dfca6e60a613dcf7b162b468fd
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/resources')
-rw-r--r-- | src/core/resources/resources.gyp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/resources/resources.gyp b/src/core/resources/resources.gyp index c37172a5c..9dcdaf0d1 100644 --- a/src/core/resources/resources.gyp +++ b/src/core/resources/resources.gyp @@ -13,16 +13,16 @@ 'qt_install_data%': '', 'qt_install_translations%': '', }, - 'dependencies': [ - '<(chromium_src_dir)/content/app/strings/content_strings.gyp:content_strings', - '<(chromium_src_dir)/blink/public/blink_resources.gyp:blink_resources', - '<(chromium_src_dir)/content/browser/devtools/devtools_resources.gyp:devtools_resources', - '../chrome_qt.gyp:chrome_resources', - ], 'targets': [ { 'target_name': 'qtwebengine_resources', 'type': 'none', + 'dependencies': [ + '<(chromium_src_dir)/content/app/strings/content_strings.gyp:content_strings', + '<(chromium_src_dir)/content/browser/devtools/devtools_resources.gyp:devtools_resources', + '<(chromium_src_dir)/third_party/WebKit/public/blink_resources.gyp:blink_resources', + '<(qtwebengine_root)/src/core/chrome_qt.gyp:chrome_resources', + ], 'actions' : [ { 'action_name': 'repack_resources', |