From 430f202718f7311c541a7243870719e2df456f2f Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Wed, 20 Nov 2013 13:45:03 +0100 Subject: 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 --- src/core/core.pro | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/core/core.pro') diff --git a/src/core/core.pro b/src/core/core.pro index b6a856545..3c3110257 100644 --- a/src/core/core.pro +++ b/src/core/core.pro @@ -13,10 +13,16 @@ gyp_configure_target.depends = gyp_configure_host # gyp_run.pro calls gyp through gyp_qtwebengine on the qmake step, and ninja on the make step. gyp_run.file = gyp_run.pro -gyp_run.depends = resources core_gyp_generator gyp_configure_host gyp_configure_target +gyp_run.depends = core_gyp_generator gyp_configure_host gyp_configure_target SUBDIRS += core_gyp_generator \ gyp_configure_host \ gyp_configure_target \ - gyp_run \ - resources \ + gyp_run + +REPACK_DIR = $$getOutDir()/$$getConfigDir()/gen/repack +resources.files = $$REPACK_DIR/qtwebengine_resources.pak +resources.path = $$[QT_INSTALL_DATA] + +INSTALLS += resources + -- cgit v1.2.3