From 03a52863226aeb774721db610ba831808b30836a Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Thu, 27 Nov 2014 14:26:57 +0100
Subject: Fix deployment problems with developer builds

This fix deploys the following files into qtbase without make install:
- qtwebengine_resources.pak
- translations/qtwebengine_locales/*.pak
- icudtl.dat
- plugins/qtwebengine/libffmpegsumo.so

Change-Id: Id2c02f03fb01571942d3135b215ebb8ad7a3221b
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
 src/core/resources/resources.gyp | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'src/core/resources/resources.gyp')

diff --git a/src/core/resources/resources.gyp b/src/core/resources/resources.gyp
index f07facca6..835a87cdf 100644
--- a/src/core/resources/resources.gyp
+++ b/src/core/resources/resources.gyp
@@ -9,6 +9,9 @@
       'sk', 'sl', 'sr', 'sv', 'sw', 'ta', 'te', 'th', 'tr', 'uk',
       'vi', 'zh-CN', 'zh-TW',
     ],
+    'locale_files': ['<!@pymod_do_main(repack_locales -o -p <(OS) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))'],
+    'qt_install_data%': '',
+    'qt_install_translations%': '',
   },
   'dependencies': [
       '<(chromium_src_dir)/webkit/webkit_resources.gyp:webkit_strings',
@@ -29,7 +32,25 @@
         'action_name': 'repack_locales',
         'includes': [ 'repack_locales.gypi' ],
       },
-    ]
+    ],
+    'conditions': [
+      ['qt_install_data != ""', {
+        'copies': [
+          {
+            'destination': '<(qt_install_data)',
+            'files': [ '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources.pak' ],
+          },
+        ],
+      }],
+      ['qt_install_translations != ""', {
+        'copies': [
+          {
+            'destination': '<(qt_install_translations)/qtwebengine_locales',
+            'files': [ '<@(locale_files)' ],
+          },
+        ],
+      }],
+    ],
   }
   ]
 }
-- 
cgit v1.2.3