diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-02-16 16:40:07 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-03-10 13:50:01 +0000 |
| commit | 2cec9ecc412fdce0ca168778f890231964b8ab7a (patch) | |
| tree | ac4ed2c285e7efbb8c8a3b20def285c69072d05a /src/core/core_module.pro | |
| parent | 623faac123fbabab5e12cbb6505178586172bdba (diff) | |
Disable installation of icudt.dat for builds using system ICU
Change-Id: I71006b596b985acbfeec883d63de67959d0b8bdb
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/core/core_module.pro')
| -rw-r--r-- | src/core/core_module.pro | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro index d489892fd..20f11486d 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -71,9 +71,13 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat locales.path = $$[QT_INSTALL_TRANSLATIONS]/qtwebengine_locales resources.CONFIG += no_check_exist resources.path = $$[QT_INSTALL_DATA]/resources - icu.CONFIG += no_check_exist - icu.path = $$[QT_INSTALL_DATA]/resources - INSTALLS += icu locales resources + INSTALLS += locales resources + + !use?(system_icu) { + icu.CONFIG += no_check_exist + icu.path = $$[QT_INSTALL_DATA]/resources + INSTALLS += icu + } } !contains(QT_CONFIG, qt_framework):!force_independent { @@ -81,11 +85,14 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat # Copy essential files to the qtbase build directory for non-prefix 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 + !use?(system_icu) { + 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 + QMAKE_EXTRA_COMPILERS += icudt2build + } resources2build.input = resources.files resources2build.output = $$[QT_INSTALL_DATA/get]/resources/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} @@ -93,7 +100,7 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat resources2build.name = COPY ${QMAKE_FILE_IN} resources2build.CONFIG = no_link no_clean target_predeps - QMAKE_EXTRA_COMPILERS += icudt2build resources2build + QMAKE_EXTRA_COMPILERS += resources2build } } |