diff options
author | Pierre Rossi <pierre.rossi@digia.com> | 2013-11-20 13:45:03 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-03 11:57:27 +0100 |
commit | 430f202718f7311c541a7243870719e2df456f2f (patch) | |
tree | 12f089ba18081aa724761848be4b7bdd5b24d7c0 /src/core/qtwebengine.gypi | |
parent | 7f980badcf1ec600f6a0a8f205a284240c501a64 (diff) |
Ship repacked .pak files
We used to wrap various .pak files in qrc files, but it turns out to be
very memory inefficient compared to chromium's approach of mmaping
those files.
Drop the pak->qrc logic and instead add some pure gyp targets to repack
the resources.
We then install those with qmake and look them up with QLibraryInfo.
Change-Id: I6dd3cedf6afa626ed181463911fef8885c9e9add
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/qtwebengine.gypi')
-rw-r--r-- | src/core/qtwebengine.gypi | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/core/qtwebengine.gypi b/src/core/qtwebengine.gypi index f13e781f5..5e36383ff 100644 --- a/src/core/qtwebengine.gypi +++ b/src/core/qtwebengine.gypi @@ -32,13 +32,13 @@ '<(chromium_src_dir)/ui/ui.gyp:ui', '<(chromium_src_dir)/url/url.gyp:url_lib', '<(chromium_src_dir)/v8/tools/gyp/v8.gyp:v8', - '<(chromium_src_dir)/webkit/webkit_resources.gyp:webkit_resources', '<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support', '<(chromium_src_dir)/third_party/WebKit/Source/web/web.gyp:webkit', ], 'include_dirs': [ - '<(qtwebengine_src_dir)', + '<(qtwebengine_root)/src/core', '<(chromium_src_dir)', + '<(SHARED_INTERMEDIATE_DIR)/net', # Needed to include grit/net_resources.h ], # Chromium code defines those in common.gypi, do the same for our code that include Chromium headers. 'defines': [ @@ -60,9 +60,6 @@ 'resource_include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)/webkit', ], - 'dependencies': [ - '<(DEPTH)/webkit/webkit_resources.gyp:webkit_strings', - ], 'configurations': { 'Debug_Base': { 'msvs_settings': { |