summaryrefslogtreecommitdiffstats
path: root/tools/buildscripts/gyp_qtwebengine
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2013-11-20 13:45:03 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-03 11:57:27 +0100
commit430f202718f7311c541a7243870719e2df456f2f (patch)
tree12f089ba18081aa724761848be4b7bdd5b24d7c0 /tools/buildscripts/gyp_qtwebengine
parent7f980badcf1ec600f6a0a8f205a284240c501a64 (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 'tools/buildscripts/gyp_qtwebengine')
-rwxr-xr-xtools/buildscripts/gyp_qtwebengine2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/buildscripts/gyp_qtwebengine b/tools/buildscripts/gyp_qtwebengine
index 48491e600..b7dd5ea12 100755
--- a/tools/buildscripts/gyp_qtwebengine
+++ b/tools/buildscripts/gyp_qtwebengine
@@ -135,7 +135,7 @@ if __name__ == '__main__':
args.extend(["--toplevel-dir=" + toplevel])
# Chromium specific Hack: for Chromium to build, the depth has to be set to the chromium src dir.
args.extend(["--depth=" + chrome_src])
- args.extend(['-D', 'qtwebengine_src_dir=' + qtwebengine_src])
+ args.extend(['-D', 'qtwebengine_root=' + qtwebengine_root])
args.extend(['-D', 'chromium_src_dir=' + chrome_src])
if 'qt_cross_compile=1' in sys.argv: