diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 18:09:08 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 18:09:08 +0100 |
| commit | b1153753221513aa5687001c84a1c9ed69925dc6 (patch) | |
| tree | 3569ad54e433fee8244effe558ca52e567b6890d /src/core/core_module.pro | |
| parent | 4d6b2dc88bda15ade9d04e54d80b7e4693d59832 (diff) | |
| parent | c2687689ba42d6021ae3f220d9fd240609489d3a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
Change-Id: I90728e965399e51b626d538924de955f9abab5fe
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 174c00afb..6d2d11d40 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -72,9 +72,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 { @@ -82,11 +86,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} @@ -94,7 +101,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 } } |