diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-20 13:59:30 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-02-20 13:59:30 +0100 |
commit | d3525d33cb9085cf1ee61b437931555fe7d932ae (patch) | |
tree | 527adee7c481769d0a77f96b25669ec86a606099 /src/core/resources/resources.gyp | |
parent | f3aaa7531e7b429d958e7002e642f4b59568ff74 (diff) | |
parent | 3c356bcf7c0fd4af7fb86824276c5a170ae10ace (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If884b8b8bc087a6a726476b49cdb48a0efaa173e
Diffstat (limited to 'src/core/resources/resources.gyp')
-rw-r--r-- | src/core/resources/resources.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/resources/resources.gyp b/src/core/resources/resources.gyp index f2acab670..4226b7561 100644 --- a/src/core/resources/resources.gyp +++ b/src/core/resources/resources.gyp @@ -47,6 +47,7 @@ '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_image_resources_100_percent.pak', ], 'pak_outputs': [ '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources_100p.pak' @@ -61,6 +62,7 @@ '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_200_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_200_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_200_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_image_resources_200_percent.pak', ], 'pak_outputs': [ '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources_200p.pak' |