summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2021-02-08 13:34:19 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2021-02-09 10:11:29 +0000
commit95e93830e45f5f10397248a794672ff6a681c8b8 (patch)
tree491a2e41f3dee46ebeb2d25ee757c53267c487ab
parent9651da8fdedb3533c5f95fa7a8028a017e508d07 (diff)
QtPdf apparently depends on libnss on linux
At least that pkg-config can resolve it. Change-Id: Id0e0a37ad4aa85f11dfdd74bc174d17d36ed4ce2 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
-rw-r--r--src/buildtools/config/support.pri1
-rw-r--r--src/buildtools/configure.json1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/buildtools/config/support.pri b/src/buildtools/config/support.pri
index e7f869a15..54b5738cd 100644
--- a/src/buildtools/config/support.pri
+++ b/src/buildtools/config/support.pri
@@ -55,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 812a91f9c..8b77d5c8c 100644
--- a/src/buildtools/configure.json
+++ b/src/buildtools/configure.json
@@ -398,6 +398,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" ]
},