diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-22 10:55:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-25 15:41:53 +0100 |
| commit | cde72003881c6b5680ac8ac0fe6d6971bb43e0d5 (patch) | |
| tree | fcb50002765c1cb179dd6f62054380c3fed85e80 /src/core/config/common.pri | |
| parent | 3fb215dab139fd7b61473ce3fe1058b87a6b4fe3 (diff) | |
| parent | 75d061bbc68875c08b3dc243e464e32a80da71df (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Including update to 87-based
Change-Id: I36b6054e00de97ab055d0bc800cff08d0408fac6
Diffstat (limited to 'src/core/config/common.pri')
| -rw-r--r-- | src/core/config/common.pri | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/core/config/common.pri b/src/core/config/common.pri index 8ffd59e99..b48d0b496 100644 --- a/src/core/config/common.pri +++ b/src/core/config/common.pri @@ -1,4 +1,3 @@ - qtConfig(webengine-printing-and-pdf) { gn_args += enable_basic_printing=true enable_print_preview=true gn_args += enable_pdf=true @@ -22,7 +21,7 @@ qtConfig(webengine-spellchecker) { qtConfig(webengine-webrtc) { gn_args += enable_webrtc=true } else { - gn_args += enable_webrtc=false audio_processing_in_audio_service_supported=false + gn_args += enable_webrtc=false } qtConfig(webengine-proprietary-codecs) { @@ -47,8 +46,4 @@ qtConfig(webengine-kerberos) { gn_args += use_kerberos=false } -qtConfig(webengine-nodejs) { - gn_args += have_nodejs=true -} else { - gn_args += have_nodejs=false -} +!qtConfig(webengine-nodejs10): gn_args += use_rollup=false |