diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-12 11:32:02 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-12 11:35:45 +0100 |
| commit | a077399f4c17f57e911334867c918cc6ddeb15fc (patch) | |
| tree | c8e4d326d7a074e9d16b68399ecc5f728f8533fe /src/core/core_module.pro | |
| parent | 3d698f5de377bde2293e222536bc50171cfdf1b8 (diff) | |
| parent | 12dd6ff845656eb625e2ee3d0e73392bc2c61983 (diff) | |
Merge branch '5.6' into dev
Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78
Diffstat (limited to 'src/core/core_module.pro')
| -rw-r--r-- | src/core/core_module.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro index 68d46cd5a..b001fef06 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -70,14 +70,14 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat locales.CONFIG += no_check_exist locales.path = $$[QT_INSTALL_TRANSLATIONS]/qtwebengine_locales resources.CONFIG += no_check_exist - resources.path = $$[QT_INSTALL_DATA] + 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 |