diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-02-15 14:57:23 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-02-17 09:12:12 +0100 |
| commit | cd12379d43f8c2df14b19ebced316aa94b3f6043 (patch) | |
| tree | f8ff1ac93a1a5502e60c243c32c54f80b1bd332d /src/buildtools | |
| parent | 4e6e907001d4cf0833465407f8a0fa68e6ce564b (diff) | |
| parent | 4c94370394ccf1e00233669df01599cb6141a5dc (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Idee0142b0e33fdf8ca663f1ef1bcd8b932985043
Diffstat (limited to 'src/buildtools')
| -rw-r--r-- | src/buildtools/config/support.pri | 2 | ||||
| -rw-r--r-- | src/buildtools/configure.json | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri index 4ba387fc2..54b5738cd 100644 --- a/src/buildtools/config/support.pri +++ b/src/buildtools/config/support.pri @@ -22,6 +22,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) { !qtwebengine_checkForBison(QtWebEngine):return(false) !qtwebengine_checkForFlex(QtWebEngine):return(false) !qtwebengine_checkForPython2(QtWebEngine):return(false) + !qtwebengine_checkForNodejs(QtWebEngine):return(false) !qtwebengine_checkForSanitizer(QtWebEngine):return(false) linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false) linux:!qtwebengine_checkForHostPkgCfg(QtWebEngine):return(false) @@ -54,6 +55,7 @@ defineReplace(qtwebengine_checkPdfError) { !qtwebengine_checkForSanitizer(QtPdf):return(false) linux:!qtwebengine_checkForPkgCfg(QtPdf):return(false) linux:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false) + linux:!qtwebengine_checkForPackage(QtPdf,nss):return(false) win32:!qtwebengine_checkForWinVersion(QtPdf):return(false) return(true) } diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json index 5819fb860..a7f1d623a 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -399,6 +399,7 @@ && (!config.sanitizer || features.webengine-sanitizer) && (!config.linux || features.pkg-config) && (!config.linux || features.webengine-host-pkg-config) + && (!config.linux || features.webengine-system-nss) && (!config.win32 || features.webengine-winversion)", "output": [ "privateFeature" ] }, |