diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-03-12 12:41:40 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-03-16 12:03:57 +0100 |
| commit | 3c544a5d0d59b0533f507a6131fbbc093ed223ea (patch) | |
| tree | c64d3ae8e17280350037ff1d6687ec797ca4715c /src/buildtools | |
| parent | e7c869c225075d898cb5d20b194af4b939d2dbc1 (diff) | |
| parent | fdec85eba16d6321597e93b447bc13a611cfdd23 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I0dd7c64669f4b130047a4a3836f62f7ee5b5f8d9
Diffstat (limited to 'src/buildtools')
| -rw-r--r-- | src/buildtools/config/support.pri | 1 | ||||
| -rw-r--r-- | src/buildtools/configure.json | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri index 54b5738cd..e7f869a15 100644 --- a/src/buildtools/config/support.pri +++ b/src/buildtools/config/support.pri @@ -55,7 +55,6 @@ 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 a7f1d623a..5819fb860 100644 --- a/src/buildtools/configure.json +++ b/src/buildtools/configure.json @@ -399,7 +399,6 @@ && (!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" ] }, |