diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-01-21 12:41:41 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-23 15:36:44 +0000 |
| commit | 4acae115d5fc0177f0fdb1af969dbc5ed501b659 (patch) | |
| tree | af26b410c51c40fd25ec9f7e4cc5d9869d469f98 /src/core | |
| parent | 9cd2cd641cde4fd958150a6ee20645e7125580ed (diff) | |
Copy all resource files to build directory
Change-Id: I1a4b96a2a695b4be4e936275c59f939b887098d1
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/core_module.pro | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro index b001fef06..5300fdbbc 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -77,13 +77,22 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat } !contains(QT_CONFIG, qt_framework): contains(QT_CONFIG, private_tests) { - ICU_TARGET = $$shell_path($$[QT_INSTALL_DATA/get]/resources/icudtl.dat) - ICU_FILE = $$shell_path($$OUT_PWD/$$getConfigDir()/icudtl.dat) - icu_rule.target = $$ICU_TARGET - unix: icu_rule.commands = if [ -e $$ICU_FILE ] ; then $$QMAKE_COPY $$ICU_FILE $$ICU_TARGET ; fi - win32: icu_rule.commands = if exist $$ICU_FILE ( $$QMAKE_COPY $$ICU_FILE $$ICU_TARGET ) - - QMAKE_EXTRA_TARGETS += icu_rule - PRE_TARGETDEPS += $$ICU_TARGET + # + # Copy essential files to the qtbase build directory (for non-installed developer builds) + # + + icudt2build.input = icu.files + icudt2build.output = $$[QT_INSTALL_DATA/get]/resources/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} + icudt2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} + icudt2build.name = COPY ${QMAKE_FILE_IN} + icudt2build.CONFIG = no_link no_clean target_predeps + + resources2build.input = resources.files + resources2build.output = $$[QT_INSTALL_DATA/get]/resources/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} + resources2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} + resources2build.name = COPY ${QMAKE_FILE_IN} + resources2build.CONFIG = no_link no_clean target_predeps + + QMAKE_EXTRA_COMPILERS += icudt2build resources2build } } |