diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2017-10-24 18:51:42 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-12 00:10:48 +0000 |
commit | 2ed1e0ba423a75f68c1547fe0c06e62e773ef64d (patch) | |
tree | 51878b13727572eec3fa89162e2a643dea84db2b /src/core/core_module.pro | |
parent | bb5a158ff01a02dbd9838094f57e0a429c248411 (diff) |
Add 'webengine' prefix to configure features, tests, libraries, etc
This is done to make sure there are no conflicts with features in
other modules, because they all share a global namespace.
Change-Id: I95b3b7fadd8ffc2979ee3aad2234ee543d57c7d8
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
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 78bb8baee..2409ccb12 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -115,7 +115,7 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat resources.path = $$[QT_INSTALL_DATA]/resources INSTALLS += locales resources - !qtConfig(system-icu) { + !qtConfig(webengine-system-icu) { icu.CONFIG += no_check_exist icu.path = $$[QT_INSTALL_DATA]/resources INSTALLS += icu @@ -127,7 +127,7 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat # Copy essential files to the qtbase build directory for non-prefix builds # - !qtConfig(system-icu) { + !qtConfig(webengine-system-icu) { COPIES += icu } |