diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-07-09 14:34:50 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-07-14 09:28:38 +0000 |
| commit | 7345ef65af262eb0b958905d7175cc836821cf25 (patch) | |
| tree | a344fd1c56a8c6eb12aa77d4fc1d26e151f57eb1 /src/core/resources/resources.gyp | |
| parent | c6f3565ed92d9f7fabd9403d70076a109b263065 (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/resources.gyp')
| -rw-r--r-- | src/core/resources/resources.gyp | 50 |
1 files changed, 49 insertions, 1 deletions
diff --git a/src/core/resources/resources.gyp b/src/core/resources/resources.gyp index 5d4d83c05..4d653df12 100644 --- a/src/core/resources/resources.gyp +++ b/src/core/resources/resources.gyp @@ -26,6 +26,46 @@ 'actions' : [ { 'action_name': 'repack_resources', + 'variables': { + '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)/blink/public/resources/blink_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak', + ], + 'pak_outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources.pak' + ] + }, + 'includes': [ 'repack_resources.gypi' ], + }, + { + 'action_name': 'repack_resources_100_percent', + 'variables': { + 'pak_inputs': [ + '<(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', + ], + 'pak_outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources_100p.pak' + ] + }, + 'includes': [ 'repack_resources.gypi' ], + }, + { + 'action_name': 'repack_resources_200_percent', + 'variables': { + 'pak_inputs': [ + '<(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', + ], + 'pak_outputs': [ + '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources_200p.pak' + ] + }, 'includes': [ 'repack_resources.gypi' ], }, { @@ -40,7 +80,15 @@ 'destination': '<(qt_install_data)', 'files': [ '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources.pak' ], }, - ], + { + 'destination': '<(qt_install_data)', + 'files': [ '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources_100p.pak' ], + }, + { + 'destination': '<(qt_install_data)', + 'files': [ '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources_200p.pak' ], + }, + ], }], ['qt_install_translations != ""', { 'copies': [ |