diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2017-09-13 19:12:38 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2017-09-20 10:43:09 +0000 |
| commit | 1691d2298a8adf511ed95d5aa5d4410adcbdd1e3 (patch) | |
| tree | daf2617622536fc9c96ed9818ecba3d892f999b7 /src/core/core_module.pro | |
| parent | c9b3baa2e2825df6b06e7366d154341f73d4e326 (diff) | |
Remove WEBENGINE_CONFIG from configure
Do not store flags in qmake.cache with WEBENGINE_CONFIG.
Use directly qtConfig values insted. This makes configuration
more consistent, simplifies handling and avoids passing
values from qtConfig to WEBENIGNE_CONFIG, which then
were passed to gn.
[ChangeLog] Removing WEBENGINE_CONFIG from qtwebengine configure
Change-Id: I1a773fb4bff6d67ad75c237d044998051d92ab51
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/core/core_module.pro')
| -rw-r--r-- | src/core/core_module.pro | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro index 1a5b66867..55b20cda2 100644 --- a/src/core/core_module.pro +++ b/src/core/core_module.pro @@ -1,3 +1,6 @@ +include($$QTWEBENGINE_OUT_ROOT/qtwebengine-config.pri) +QT_FOR_CONFIG += webengine-private + MODULE = webenginecore include(core_common.pri) @@ -110,7 +113,7 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat resources.path = $$[QT_INSTALL_DATA]/resources INSTALLS += locales resources - !use?(system_icu) { + !qtConfig(system-icu) { icu.CONFIG += no_check_exist icu.path = $$[QT_INSTALL_DATA]/resources INSTALLS += icu @@ -122,7 +125,7 @@ icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat # Copy essential files to the qtbase build directory for non-prefix builds # - !use?(system_icu) { + !qtConfig(system-icu) { COPIES += icu } |