diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-18 14:42:00 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-18 14:42:00 +0200 |
| commit | ee2b1e71a80f88de90a03e10a89ba491ef99d308 (patch) | |
| tree | b14cd541a3f7ad1fc6739e0f5a02d479334b6b34 /src/core/resources/resources.gyp | |
| parent | 61bdfb046700068afe36007ede3dcba1104099a3 (diff) | |
| parent | 7db354d1a21a17da76244b77c35d7297be3a86a9 (diff) | |
Merge branch '5.6' into 5.7
Change-Id: I490e0ee46d3ff040ca26426feb7e4d6ef7098f94
Diffstat (limited to 'src/core/resources/resources.gyp')
| -rw-r--r-- | src/core/resources/resources.gyp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/core/resources/resources.gyp b/src/core/resources/resources.gyp index 4226b7561..88c5bb4be 100644 --- a/src/core/resources/resources.gyp +++ b/src/core/resources/resources.gyp @@ -87,32 +87,6 @@ 'includes': [ 'repack_locales.gypi' ], }, ], - 'conditions': [ - ['qt_install_data != ""', { - 'copies': [ - { - 'destination': '<(qt_install_data)/resources', - 'files': [ '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources.pak' ], - }, - { - 'destination': '<(qt_install_data)/resources', - 'files': [ '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources_100p.pak' ], - }, - { - 'destination': '<(qt_install_data)/resources', - 'files': [ '<(SHARED_INTERMEDIATE_DIR)/repack/qtwebengine_resources_200p.pak' ], - }, - ], - }], - ['qt_install_translations != ""', { - 'copies': [ - { - 'destination': '<(qt_install_translations)/qtwebengine_locales', - 'files': [ '<@(locale_files)' ], - }, - ], - }], - ], } ] } |