diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-02-17 16:48:03 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-04-15 14:39:39 +0000 |
| commit | 7db354d1a21a17da76244b77c35d7297be3a86a9 (patch) | |
| tree | 9aaa53bc7aee024456481617b4f6fc45cfd241e2 | |
| parent | d49bc176c762b77fa6beeee472adc7764ea86829 (diff) | |
Install all resources for developer build in .pro file
ICU .dat file and .pak files were already copied to
the developer build directory in core_module.pro. Let's
do the same for translations, and remove the logic
handling this in resources.gyp.
Change-Id: I4926cd6012f2664feed27aa042eb3ceb282a93d9
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | src/core/core_module.pro | 8 | ||||
| -rw-r--r-- | src/core/resources/resources.gyp | 26 |
2 files changed, 8 insertions, 26 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro index 20f11486d..c2fa5f9a7 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -101,6 +101,14 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat resources2build.CONFIG = no_link no_clean target_predeps QMAKE_EXTRA_COMPILERS += resources2build + + locales2build.input = locales.files + locales2build.output = $$[QT_INSTALL_DATA/get]/translations/qtwebengine_locales/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} + locales2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} + locales2build.name = COPY ${QMAKE_FILE_IN} + locales2build.CONFIG = no_link no_clean target_predeps + + QMAKE_EXTRA_COMPILERS += locales2build } } diff --git a/src/core/resources/resources.gyp b/src/core/resources/resources.gyp index 2a58449f8..c37172a5c 100644 --- a/src/core/resources/resources.gyp +++ b/src/core/resources/resources.gyp @@ -75,32 +75,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)' ], - }, - ], - }], - ], } ] } |