diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-29 14:09:05 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-08-02 12:00:57 +0200 |
commit | 1a49f193afe1ba54339182a49d891917159f6719 (patch) | |
tree | 986cf277193c625c2f61015c7f29c6b403a5eb02 /src/core/resources/resources.gyp | |
parent | 47d6b5ce11d1014548ba69df5d7b698381a8343e (diff) | |
parent | fa138d4a76e9e820f01a75771c30dbced8c4e6f3 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/core/resources/resources.gyp
src/webengine/doc/src/qtwebengine-overview.qdoc
src/webenginewidgets/api/qwebenginepage.cpp
src/webenginewidgets/api/qwebenginescriptcollection.cpp
src/webenginewidgets/api/qwebenginescriptcollection_p.h
tests/auto/widgets/qwebenginepage/BLACKLIST
And readded newly in 5.6 enabled tests to the BLACKLIST.
Change-Id: I4ab1fc54ebfaaf940df81b0d8d6bdd15cae8b7c4
Diffstat (limited to 'src/core/resources/resources.gyp')
-rw-r--r-- | src/core/resources/resources.gyp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/resources/resources.gyp b/src/core/resources/resources.gyp index 88c5bb4be..618b4d355 100644 --- a/src/core/resources/resources.gyp +++ b/src/core/resources/resources.gyp @@ -13,17 +13,17 @@ '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', - '<(chromium_src_dir)/components/components_strings.gyp:components_strings', - '../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)/components/components_strings.gyp:components_strings', + '<(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', |