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 /mkspecs/features/functions.prf | |
| 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 'mkspecs/features/functions.prf')
| -rw-r--r-- | mkspecs/features/functions.prf | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf index 0074a27b0..3f0d64ba5 100644 --- a/mkspecs/features/functions.prf +++ b/mkspecs/features/functions.prf @@ -47,11 +47,6 @@ defineReplace(which) { return($$out) } -defineTest(use?) { - contains(WEBENGINE_CONFIG, use_$$lower($$1)): return(true) - return(false) -} - # Returns the unquoted path to the python executable. defineReplace(pythonPath) { isEmpty(QMAKE_PYTHON2) { @@ -88,7 +83,7 @@ defineReplace(gnPath) { defineReplace(gnArgs) { linux { - contains(WEBENGINE_CONFIG, embedded_build): include($$QTWEBENGINE_ROOT/src/core/config/embedded_linux.pri) + qtConfig(embedded): include($$QTWEBENGINE_ROOT/src/core/config/embedded_linux.pri) else: include($$QTWEBENGINE_ROOT/src/core/config/desktop_linux.pri) } macos: include($$QTWEBENGINE_ROOT/src/core/config/mac_osx.pri) |