summaryrefslogtreecommitdiffstats
path: root/src/buildtools
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-02-11 16:41:48 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-02-17 17:40:41 +0100
commit3ca825bbe6d334c08d2d55df792d6670036527e7 (patch)
treee2cf9c5b8c1b13ad0d18c75957feef20918f628b /src/buildtools
parentb30c29da75c48513c4b334d0f85dca5ef7a2919e (diff)
Remove QtPdf dependency on nss at build-time
Change-Id: I653dee03adcad422d1210fda48bdd5b701382b00 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/buildtools')
-rw-r--r--src/buildtools/config/support.pri1
-rw-r--r--src/buildtools/configure.json1
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 8b77d5c8c..812a91f9c 100644
--- a/src/buildtools/configure.json
+++ b/src/buildtools/configure.json
@@ -398,7 +398,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" ]
},