diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-11 15:31:05 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-11 15:01:49 +0000 |
| commit | 12dd6ff845656eb625e2ee3d0e73392bc2c61983 (patch) | |
| tree | 97ca4093e2760f49530e1ead86dff177fe26b760 /src/core/core_module.pro | |
| parent | 9a8fe6c59a41f7a42ee0cf14e536202bd5be3a64 (diff) | |
Move ICU data to resources sub-dir
Also moves the ICU data from the prefix root to the resources subdir.
Change-Id: I1eec6c09a8ff1f87166a9f8a2a010b770198751e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/core/core_module.pro')
| -rw-r--r-- | src/core/core_module.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro index 3ad041d74..b001fef06 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -72,12 +72,12 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat resources.CONFIG += no_check_exist resources.path = $$[QT_INSTALL_DATA]/resources icu.CONFIG += no_check_exist - icu.path = $$[QT_INSTALL_DATA] + icu.path = $$[QT_INSTALL_DATA]/resources INSTALLS += icu locales resources } !contains(QT_CONFIG, qt_framework): contains(QT_CONFIG, private_tests) { - ICU_TARGET = $$shell_path($$[QT_INSTALL_DATA/get]/icudtl.dat) + 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 |