diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-24 18:49:30 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-28 13:33:11 +0100 |
| commit | 9be81c588afc913f5214d78608fecafeef8bc160 (patch) | |
| tree | 19b06bff7e5016845ad30babc32ae5cc9f3834e6 /src/core/resources/repack_resources.gypi | |
| parent | 9a1a09bf82ea98a2b69b351120619c787ce990a8 (diff) | |
Get rid of GTK dependencies
Build with aura by default and remove GTK related code.
This patch introduces a mechanism for setting gyp build
configuration variables using a GYP_CONFIG and adds a
desktop_linux.pri configuration for this target.
Change-Id: I6b044ba52ebb20c187572669af94a6fc280b0412
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/core/resources/repack_resources.gypi')
| -rw-r--r-- | src/core/resources/repack_resources.gypi | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/resources/repack_resources.gypi b/src/core/resources/repack_resources.gypi index 49bd52b8e..5a955cccc 100644 --- a/src/core/resources/repack_resources.gypi +++ b/src/core/resources/repack_resources.gypi @@ -8,8 +8,11 @@ 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', -# FIXME: we'll probably want those as well -# '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/webui_resources.pak', ], }, 'inputs': [ |