summaryrefslogtreecommitdiffstats
path: root/src/core/resources/repack_resources.gypi
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2015-07-09 14:34:50 +0200
committerKai Koehne <kai.koehne@theqtcompany.com>2015-07-14 09:28:38 +0000
commit7345ef65af262eb0b958905d7175cc836821cf25 (patch)
treea344fd1c56a8c6eb12aa77d4fc1d26e151f57eb1 /src/core/resources/repack_resources.gypi
parentc6f3565ed92d9f7fabd9403d70076a109b263065 (diff)
Add 200 percent image resources
Move out the resources intended for 100% scale factor from qtwebengine_resources.pak into a separate _100p.pak, and add also a _200p.pak. This fixes crashes and artifacts on Windows with high-DPI setups. [ChangeLog] qtwebengine_resources_100p.pak and qtwebengine_resources_200p.pak have been added alongside qtwebengine_resources.pak. Depending on the target environment either one or both have to be deployed. Task-number: QTBUG-47018 Change-Id: I1f305ada3ca4e4ae356276a59e0e92c94cca2d3f Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/core/resources/repack_resources.gypi')
-rw-r--r--src/core/resources/repack_resources.gypi12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/core/resources/repack_resources.gypi b/src/core/resources/repack_resources.gypi
index b5d8c9d91..ce224e625 100644
--- a/src/core/resources/repack_resources.gypi
+++ b/src/core/resources/repack_resources.gypi
@@ -4,23 +4,13 @@
{
'variables': {
'repack_path': '<(chromium_src_dir)/tools/grit/grit/format/repack.py',
- 'pak_inputs': [
- '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
- '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent.pak',
- ],
},
'inputs': [
'<(repack_path)',
'<@(pak_inputs)',
],
'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources.pak',
+ '<@(pak_outputs)',
],
'action': ['python', '<(repack_path)', '<@(_outputs)', '<@(pak_inputs)'],
}